Merge branch 'da/difftool' into maint
[gitweb.git] / t / t4020 /
drwxr-xr-x   parent (dest: t; base: 389c3289cfa5bc0a232ad52df70fae1f6863d1a4)
-rw-r--r-- 116 diff.NUL