# HG changeset patch # User Steve Losh # Date 1307984059 14400 # Node ID 112752863b5b14112f6a65f0c67d3c40b93f9de1 # Parent 158ad3aea81048d7c3bfefa7a00774f1aa84e1d2 Typo. diff -r 158ad3aea810 -r 112752863b5b README.markdown --- 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