mergetools: add support for guiffy
[gitweb.git] / t / t7505 /
drwxr-xr-x   parent (dest: t; base: 6ceb658c9905cad2436810370c6590fc260a6b64)
-rw-r--r-- 535 expected-rebase-i
-rw-r--r-- 570 expected-rebase-p