# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1285906100 14400
# Node ID e3054449657554c6819c7cf6921ec40b6f456aa2
# Parent  c8778d16410a944f7262c0a39b8266c049966c15
mercurial: add real merge aliases

diff -r c8778d16410a -r e30544496575 .hgrc
--- a/.hgrc	Thu Sep 30 23:06:11 2010 -0400
+++ b/.hgrc	Fri Oct 01 00:08:20 2010 -0400
@@ -96,9 +96,9 @@
 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
 cmwn = commit -m 'Merge with Nick.'
 
-#mlocal = merge --config 'ui.merge=internal:local'
-#mother = merge --config 'ui.merge=internal:other'
-#mfail = merge --config 'ui.merge=internal:fail'
+mergelocal = $HG --config ui.merge=internal:local merge $@
+mergeother = $HG --config ui.merge=internal:other merge $@
+mergefail = $HG --config ui.merge=internal:fail merge $@
 
 fdiff = diff -U 10000000000000
 qfdiff = qdiff -U 10000000000000