merge: extract prepare_merge_message() logic out
[git] / contrib / diff-highlight /
drwxr-xr-x   ..
-rw-r--r-- 5343 README
-rwxr-xr-x 3965 diff-highlight