tests: document format of conflicts from checkout -m
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 47349a8cc02b3cb39bfc69cb7abec88ad3e34ebf)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321531 gitk
drwxr-xr-x - po