mergetools / gvimdiffon commit merge: fix NULL pointer dereference when merging nothing into void (b84e65d)
   1. "$MERGE_TOOLS_DIR/vimdiff"