hg.stevelosh.com > dotfiles

--- 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
author	Steve Losh <steve@stevelosh.com>
date	Fri, 01 Oct 2010 00:08:20 -0400
parents	c8778d16410a
children	48cacfdc2ca6
branches/tags	(none)
files	.hgrc