diff -r 9719c267a562 -r 6b37ae369769 .hgrc --- a/.hgrc Tue Dec 08 20:56:33 2015 +0200 +++ b/.hgrc Thu Dec 10 12:32:01 2015 +0200 @@ -5,7 +5,7 @@ username = Oleksandr Gavenko ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. merge = internal:merge -editor = emacs -q +; editor = emacs -q ignore = ~/.hgignore style = ~/.hgstyle