# HG changeset patch # User Oleksandr Gavenko # Date 1316212125 -10800 # Node ID 6fd142910e94a694c8a9e5264c30cd89a856a349 # Parent 212adbf0e988bacdf98b922d344a1acea14f63ed Use git diff style to show file permission changes. diff -r 212adbf0e988 -r 6fd142910e94 .hgrc --- a/.hgrc Thu Sep 08 17:15:27 2011 +0300 +++ b/.hgrc Sat Sep 17 01:28:45 2011 +0300 @@ -12,6 +12,7 @@ log = -v -f incoming = -v outgoing = -v +diff = --git [merge-tools] emacs.args = -q --eval "(ediff-merge-with-ancestor \"$local\" \"$other\" \"$base\" nil \"$output\")"