mergetools / gvimdiffon commit Merge branch 'ks/commit-assuming-only-warning-removal' (c4f70d2)
   1. "$MERGE_TOOLS_DIR/vimdiff"