hg.stevelosh.com > splice.vim

57a4142285fb v0.0.2 

Doc tweaks.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Mon, 13 Jun 2011 14:43:33 -0400
parents 110df92610ac
children 124cbd25b6a9
branches/tags v0.0.2
files README.markdown doc/threesome.txt

Changes

--- a/README.markdown	Mon Jun 13 14:39:10 2011 -0400
+++ b/README.markdown	Mon Jun 13 14:43:33 2011 -0400
@@ -72,7 +72,5 @@
 More Information
 ================
 
-Read the full documentation to learn more:
+Read the full documentation to learn more `:help threesome`
 
-    :help threesome
-
--- a/doc/threesome.txt	Mon Jun 13 14:39:10 2011 -0400
+++ b/doc/threesome.txt	Mon Jun 13 14:43:33 2011 -0400
@@ -240,7 +240,7 @@
                         contents of the result file as the result.
 
 <localleader>CC                                    *Cancel*
-                        Exits Vim with an error code (like :cq).
+                        Exits Vim with an error code (like |:cquit|).
                         Indicates to the VCS that the merge was
                         NOT successful.