diff -r 02b91508db83 -r 2306b12ff466 .hgrc --- a/.hgrc Sat Jan 29 22:19:23 2011 +0200 +++ b/.hgrc Fri Feb 18 16:47:17 2011 +0200 @@ -1,7 +1,9 @@ ; -*- mode: ini-generic; coding: utf-8 -*- [ui] +; Who are you? username = Oleksandr Gavenko +; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file. merge = internal:merge editor = emacs -q @@ -14,24 +16,14 @@ encoding = utf-8 [extensions] -; For old Mercurial. -; fetch = +; To allow 'fetch' command. hgext.fetch = +; To allow Mercurial Queues. hgext.mq = +; To import revisions from foreign VCS repositories into Mercurial. hgext.convert = ; Usage: hg glog hgext.graphlog = -; hgext.win32text = +; Enable '.hgeol' tracking (fix for CR/LF). +hgext.eol = -; [encode] -; **.py = cleverencode: -; **.c = cleverencode: -; **.h = cleverencode: -; **.java = cleverencode: -; **.txt = cleverencode: -; [decode] -; **.py = cleverdecode: -; **.c = cleverdecode: -; **.h = cleverdecode: -; **.java = cleverdecode: -; **.txt = cleverdecode: