mergetools / gvimdiff3on commit Merge branch 'mt/rebase-i-keep-empty-test' (0756529)
   1. "$MERGE_TOOLS_DIR/vimdiff"