70:b2ed3aee8024
Anton Shestakov <engored@ya.ru>, 2014-12-21
git prompt session: demonstrate merge with conflicts

next change 119:d54e285942f3
previous change 37:3eba5c29ae0d

.hgeditor

Other formats: Feeds:
Inserted Replaced Deleted
69:3e6ac54990dd 70:b2ed3aee8024