merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / contrib / workdir /
drwxr-xr-x   parent (dest: contrib; base: 261f315b)
-rwxr-xr-x 1886 git-new-workdir