mergetools / gvimdiffon commit Merge branch 'jk/diff-files-assume-unchanged' into maint (11aae3e)
   1. "$MERGE_TOOLS_DIR/vimdiff"