mergetools / gvimdiff2on commit Merge branch 'bb/pedantic' (00da9b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"