mergetools / gvimdiffon commit Merge branch 'ds/find-unique-abbrev-optim' into next (0b6d4f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"