checkout.txt: note about losing staged changes with --merge
[gitweb.git] / t / t4034 / pascal /
drwxr-xr-x   parent (dest: t/t4034; base: a7256debd4b6)
-rw-r--r-- 2045 expect
-rw-r--r-- 238 post
-rw-r--r-- 232 pre