3908cdb23497
Notes.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 13 Jun 2011 22:04:13 -0400 |
| parents | 813b751f6fa3 |
| children | 4f7162aa3541 |
| branches/tags | (none) |
| files | README.markdown |
Changes
--- 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 ----------------