hg.stevelosh.com > dotfiles

1807308d184d 

Moar.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Tue, 12 Jul 2011 11:37:24 -0400
parents 045d5701c8d4
children 33fb4219a011
branches/tags (none)
files .hgrc .pentadactylrc

Changes

--- 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
--- 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