# HG changeset patch # User Steve Losh # Date 1308017053 14400 # Node ID 3908cdb23497cb1f41f29a1a82dadcd4a147881c # Parent 813b751f6fa3df343f0b637b1eca427c6f8a04d8 Notes. diff -r 813b751f6fa3 -r 3908cdb23497 README.markdown --- a/README.markdown Mon Jun 13 22:01:56 2011 -0400 +++ b/README.markdown Mon Jun 13 22:04:13 2011 -0400 @@ -62,6 +62,8 @@ threesome.premerge = keep threesome.priority = 1 +**Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console. + ### Git Add the following lines to `~/.gitconfig`: @@ -73,8 +75,7 @@ cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'" trustExitCode = true -**Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you -prefer to keep the editor in the console. +**Note:** replace `mvim` with `gvim` if you're on Linux, or just plain `vim` if you prefer to keep the editor in the console. More Information ----------------