mergetools / gvimdiff3on commit Merge branch 'br/commit-tree-parseopt' (0c45fa3)
   1. "$MERGE_TOOLS_DIR/vimdiff"