revert: clarify label on conflict hunks
[gitweb.git] / t / t7006 /
drwxr-xr-x   parent (dest: t; base: d68565402a69fac3fe0e0653718feca7c80c178b)
-rwxr-xr-x 1272 test-terminal.perl