70:b2ed3aee8024
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 18:00:24 +0800
git prompt session: demonstrate merge with conflicts

next change 72:b804b7e6f05a
previous change 63:d61b71570ebd

.hgrc

Permissions: -rw-r--r--

Other formats: Feeds:
[ui]
username = Anton Shestakov <engored@ya.ru>
ssh = ssh -C
editor = ~/.hgeditor
[extensions]
record =
pager =
graphlog =
progress =
color =
rebase =
shelve =
[diff]
git = True
showfunc = True
[pager]
pager = LESS='FSRX' less
[color]
status.added = green
status.unknown = none
changeset.public = green
changeset.secret = red