mergetools / gvimdiffon commit Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' (4ed3863)
   1. "$MERGE_TOOLS_DIR/vimdiff"