rebase: make resolve message clearer for inexperienced users
[gitweb.git] / t / t9115 /
drwxr-xr-x   parent (dest: t; base: 5fdacc17c7eb2a7b435d62d99b41f75f44f74de1)
-rw-r--r-- 1490 funky-names.dump