mergetools / gvimdiffon commit Merge branch 'ds/find-unique-abbrev-optim' (7519a60)
   1. "$MERGE_TOOLS_DIR/vimdiff"