checkout: prevent losing staged changes with --merge
[gitweb.git] / t / t4256 / 1 /
drwxr-xr-x   parent (dest: t/t4256; base: 6eff409e8a76)
-rw-r--r-- 28374 mailinfo.c
-rw-r--r-- 26987 mailinfo.c.orig
-rw-r--r-- 3381 patch