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

/

.config/ drwxr-xr-x files
docs/ drwxr-xr-x files
fonts/ drwxr-xr-x files
geany/ filedefs drwxr-xr-x files
.bash_aliases 187 -rw-r--r-- file | revisions | annotate
.bash_prompt 4555 -rw-r--r-- file | revisions | annotate
.bashrc 1181 -rw-r--r-- file | revisions | annotate
.hgeditor 1305 -rwxr-xr-x file | revisions | annotate
.hgrc 331 -rw-r--r-- file | revisions | annotate
.vimrc 1676 -rw-r--r-- file | revisions | annotate
.xxkbrc 175 -rw-r--r-- file | revisions | annotate
README.rst 2266 -rw-r--r-- file | revisions | annotate