Use nice names in conflict markers during cherry-pick/revert.
[git] / contrib / completion /
drwxr-xr-x   ..
-rwxr-xr-x 20157 git-completion.bash