child 71:60c7d2a1ec38
parent 69:3e6ac54990dd
70:b2ed3aee8024
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 18:00:24 +0800
git prompt session: demonstrate merge with conflicts

/geany/

.. drwxr-xr-x
filedefs/ drwxr-xr-x files