sequencer: signal failed ff as an aborted, not a conflicted merge
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: 43dee070eb8faa400f24a9fee08e64d2d18224c2)
-rw-r--r-- 2158 Makefile
-rwxr-xr-x 344042 gitk
drwxr-xr-x - po