checkout: prevent losing staged changes with --merge
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: 6eff409e8a760645ae5357d1e95e7e7ff3c04456)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre