mergetools / gvimdiff2on commit fsck: don't put a void*-shaped peg in a char*-shaped hole (16aa3bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"