mergetools / gvimdiff3on commit Do not print 'dangling' for cat-file in case of ambiguity (d1dd94b)
   1. "$MERGE_TOOLS_DIR/vimdiff"