112752863b5b
Typo.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 13 Jun 2011 12:54:19 -0400 |
| parents | 158ad3aea810 |
| children | 4267ab99b32b |
| branches/tags | (none) |
| files | README.markdown |
Changes
--- a/README.markdown Mon Jun 13 12:52:56 2011 -0400 +++ b/README.markdown Mon Jun 13 12:54:19 2011 -0400 @@ -32,7 +32,7 @@ [merge-tools] threesome.executable = mvim - threesome.args = -f -O4 $base $local $other $output -c 'ThreesomeInit' + threesome.args = -f $base $local $other $output -c 'ThreesomeInit' threesome.premerge = keep threesome.priority = 1