mergetools / gvimdiff3on commit rerere: error out on autoupdate failure (89ea903)
   1. "$MERGE_TOOLS_DIR/vimdiff"