mergetools / gvimdiffon commit Merge branch 'jc/merge-x-theirs-docfix' into maint (77cdf8c)
   1. "$MERGE_TOOLS_DIR/vimdiff"