# HG changeset patch # User Steve Losh # Date 1307990613 14400 # Node ID 57a4142285fb45fd4691c085a448c141b48f06d3 # Parent 110df92610acccc635aee4b80e86e9b82e08e33f Doc tweaks. diff -r 110df92610ac -r 57a4142285fb README.markdown --- 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 - diff -r 110df92610ac -r 57a4142285fb doc/threesome.txt --- 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. 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.