mergetools / gvimdiffon commit Merge branch 'jc/apply-ignore-whitespace' into maint (c122c9a)
   1. "$MERGE_TOOLS_DIR/vimdiff"