Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[gitweb.git] / t / t4034 / ada /
drwxr-xr-x   parent (dest: t/t4034; base: 216d29ef257e48f95bc14765d5da17e7854a3109)
-rw-r--r-- 1168 expect
-rw-r--r-- 148 post
-rw-r--r-- 149 pre