rebase: make resolve message clearer for inexperienced users
[gitweb.git] / t / t4051 /
drwxr-xr-x   parent (dest: t; base: 5fdacc17c7eb2a7b435d62d99b41f75f44f74de1)
-rw-r--r-- 224 appended1.c
-rw-r--r-- 1385 appended2.c
-rw-r--r-- 88 dummy.c
-rw-r--r-- 309 hello.c
-rw-r--r-- 407 includes.c