sequencer: signal failed ff as an aborted, not a conflicted merge
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 43dee070eb8faa400f24a9fee08e64d2d18224c2)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight