ea8c6c4ec89b

--- a/.hgrc	Wed Jul 13 10:52:14 2011 -0400
+++ b/.hgrc	Wed Jul 13 16:32:55 2011 -0400
@@ -66,6 +66,14 @@
 threesome.premerge = keep
 threesome.priority = 1
 
+keepthat.executable = sh
+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.premerge = True
+
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>