merge: force edit and no-ff mode when merging a tag object
[gitweb.git] / t / t4034 / html /
drwxr-xr-x   parent (dest: t/t4034; base: fab47d05)
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre