Merge branch 'master' of github.com:jmoiron/dotfiles

jmoiron · Jan 24, 2015 · 161ea00 · 161ea00
2 parents d179b60 + 666ce92
commit 161ea00
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/home/.hgrc b/home/.hgrc
@@ -20,3 +20,6 @@ mod = st -mard
 [merge-tools]
 vimdiff.executable = vim
 vimdiff.args = -d $base $local $output $other +close +close
+
+[trusted]
+users = 501