68:c90c3504fbb3
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 17:16:28 +0800
git prompt: show merges (without conflict)

previous change 14:cb8ef1bc6712

geany/filedefs/filetypes.html

Permissions: -rw-r--r--

Other formats: Feeds:
[indentation]
# 0 is spaces, 1 is tabs, 2 is tab & spaces
type=0
width=2