mergetools / gvimdiff2on commit Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' (9ce2824)
   1. "$MERGE_TOOLS_DIR/vimdiff"