child 73:0019b1cd36af
parent 71:60c7d2a1ec38
72:b804b7e6f05a
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 20:23:19 +0800
hgrc: detailed merge markers

/geany/

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