mergetools / gvimdiff2on commit update-ref --stdin -z: deprecate interpreting the empty string as zeros (1fbd504)
   1. "$MERGE_TOOLS_DIR/vimdiff"