mergetools / gvimdiff2on commit Merge branch 'bc/hash-independent-tests-part-4' (a7b27d9)
   1. "$MERGE_TOOLS_DIR/vimdiff"