mergetools / gvimdiff3on commit Merge branch 'ad/sha1-update-chunked' (4672123)
   1. "$MERGE_TOOLS_DIR/vimdiff"