mergetools / gvimdiff2on commit Merge branch 'da/difftool-mergetool-simplify-reporting-status' (0ddedd4)
   1. "$MERGE_TOOLS_DIR/vimdiff"