mergetools / gvimdiff3on commit Merge branch 'jk/fetch-all-peeled-fix' (0079732)
   1. "$MERGE_TOOLS_DIR/vimdiff"