mergetools / gvimdiffon commit Merge branch 'jk/two-way-merge-corner-case-fix' (3979580)
   1. "$MERGE_TOOLS_DIR/vimdiff"