# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1308006327 14400
# Node ID 7db534146a3ebeda80447c8e67fbdd35bc4278eb
# Parent  3a2ecf1356ef9a60293081b93b372e0d9f8197fa
Fix grid goto result, and hurr durr markdown.

diff -r 3a2ecf1356ef -r 7db534146a3e README.markdown
--- a/README.markdown	Mon Jun 13 18:56:09 2011 -0400
+++ b/README.markdown	Mon Jun 13 19:05:27 2011 -0400
@@ -17,11 +17,11 @@
 It's designed to be used as a merge tool for version control systems like
 Mercurial and Git.
 
-**Source (Mercurial):** <http://bitbucket.org/sjl/threesome.vim>
-**Source (Git):** <http://github.com/sjl/threesome.vim>
-**Issues:** <http://github.com/sjl/threesome.vim/issues>
-**License:** MIT X11
-**Full Documentation:** `:help threesome`
+* **Source (Mercurial):** <http://bitbucket.org/sjl/threesome.vim>
+* **Source (Git):** <http://github.com/sjl/threesome.vim>
+* **Issues:** <http://github.com/sjl/threesome.vim/issues>
+* **License:** MIT X11
+* **Full Documentation:** `:help threesome`
 
 Requirements
 ============
diff -r 3a2ecf1356ef -r 7db534146a3e plugin/threesomelib/modes.py
--- a/plugin/threesomelib/modes.py	Mon Jun 13 18:56:09 2011 -0400
+++ b/plugin/threesomelib/modes.py	Mon Jun 13 19:05:27 2011 -0400
@@ -164,13 +164,13 @@
     Layout 0                 Layout 1                        Layout 2
     +-------------------+    +--------------------------+    +---------------+
     |     Original      |    | One    | Result | Two    |    |      One      |
-    |1                  |    |        |        |        |    |1              |
+    |2                  |    |        |        |        |    |2              |
     +-------------------+    |        |        |        |    +---------------+
     |  One    |    Two  |    |        |        |        |    |     Result    |
-    |2        |3        |    |        |        |        |    |2              |
+    |3        |4        |    |        |        |        |    |3              |
     +-------------------+    |        |        |        |    +---------------+
     |      Result       |    |        |        |        |    |      Two      |
-    |4                  |    |1       |2       |3       |    |3              |
+    |5                  |    |2       |3       |4       |    |4              |
     +-------------------+    +--------------------------+    +---------------+
     """
 
@@ -315,11 +315,11 @@
 
     def goto_result(self):
         if self._current_layout == 0:
-            windows.focus(4)
+            windows.focus(5)
         elif self._current_layout == 1:
-            windows.focus(2)
+            windows.focus(3)
         elif self._current_layout == 2:
-            windows.focus(2)
+            windows.focus(3)
 
 
     def hud_diagram(self):
@@ -600,6 +600,7 @@
     def goto_result(self):
         self.key_result()
 
+
     def hud_diagram(self):
         bufmap = { buffers.original.name: 'Original',
                    buffers.one.name: 'One',