child 70:b2ed3aee8024
parent 68:c90c3504fbb3
69:3e6ac54990dd
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 17:55:50 +0800
git prompt: show merges with conflicts

/geany/

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