# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1310485044 14400
# Node ID 1807308d184d1051813452fbafee0735d9b4e1cf
# Parent  045d5701c8d4e68e5e168f2a6052b74cd74a6a4e
Moar.

diff -r 045d5701c8d4 -r 1807308d184d .hgrc
--- a/.hgrc	Fri Jul 08 16:54:03 2011 -0400
+++ b/.hgrc	Tue Jul 12 11:37:24 2011 -0400
@@ -110,9 +110,9 @@
 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
 cmm = commit -m 'Merge.'
 
-mergelocal = $HG --config ui.merge=internal:local merge $@
-mergeother = $HG --config ui.merge=internal:other merge $@
-mergefail = $HG --config ui.merge=internal:fail merge $@
+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
diff -r 045d5701c8d4 -r 1807308d184d .pentadactylrc
--- a/.pentadactylrc	Fri Jul 08 16:54:03 2011 -0400
+++ b/.pentadactylrc	Tue Jul 12 11:37:24 2011 -0400
@@ -12,6 +12,7 @@
 set editor='/usr/local/bin/mvim -f +<line> <file>'
 set followhints=1
 set showtabline=multitab
+set showstatuslinks=command
 
 nnoremap j 3j
 nnoremap k 3k