tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t7006 /
drwxr-xr-x   parent (dest: t; base: 6a843348ab08e7c701ac2343ffbe2d11ecb7ebab)
-rwxr-xr-x 1272 test-terminal.perl