rebase: make resolve message clearer for inexperienced users
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 5fdacc17c7eb2a7b435d62d99b41f75f44f74de1)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre