builtin/merge.c: fix a bug with trivial merges
[gitweb.git] / t / t4034 / python /
drwxr-xr-x   parent (dest: t/t4034; base: 40d71940b6a0dadb7873cce614992f1d71fcdfbd)
-rw-r--r-- 2019 expect
-rw-r--r-- 239 post
-rw-r--r-- 226 pre