mergetools / gvimdiff2on commit assume parse_commit checks for NULL commit (5e7d4d3)
   1. "$MERGE_TOOLS_DIR/vimdiff"