mergetools / gvimdiff3on commit Merge branch 'jk/reset-ident-time-per-commit' (24fbe00)
   1. "$MERGE_TOOLS_DIR/vimdiff"