# HG changeset patch # User Steve Losh # Date 1310590222 14400 # Node ID a6d28812229724038bb899cc3595bd9b93cda024 # Parent 92c5632d9bc899651cf3be556890d8b4b07557c5 Wrap with quotes. diff -r 92c5632d9bc8 -r a6d288122297 .hgrc --- a/.hgrc Wed Jul 13 16:33:06 2011 -0400 +++ b/.hgrc Wed Jul 13 16:50:22 2011 -0400 @@ -67,11 +67,11 @@ threesome.priority = 1 keepthat.executable = sh -keepthat.args = -c 'cp $local $output.original && cp $other $output' +keepthat.args = -c 'cp "$local" "$output.original" && cp "$other" "$output"' keepthat.premerge = True keepthis.executable = sh -keepthis.args = -c 'cp $other $output.incoming && cp $local $output' +keepthis.args = -c 'cp "$other" "$output.incoming" && cp "$local" "$output"' keepthis.premerge = True [email]