mergetools / gvimdiff2on commit typofix: cherry is spelled with two ars (7a96c38)
   1. "$MERGE_TOOLS_DIR/vimdiff"