Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
[gitweb.git] / t / t4034 / tex /
drwxr-xr-x   parent (dest: t/t4034; base: 5a2c86fb08cc195ca39d82e2c2d84158f05b96fc)
-rw-r--r-- 343 expect
-rw-r--r-- 84 post
-rw-r--r-- 72 pre