mergetools / gvimdiff3on commit Merge branch 'rs/commit-parsing-optim' (98c96f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"