rebase: show consistent conflict resolution hint
[gitweb.git] / t / t4034 / html /
drwxr-xr-x   parent (dest: t/t4034; base: 89c7ae9c3bffe599b46a18a9a504fd3e28a9e715)
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre