mergetools / gvimdiffon commit Merge branch 'rs/discard-index-discard-array' (08bcd77)
   1. "$MERGE_TOOLS_DIR/vimdiff"