mergetools / gvimdiff3on commit rerere: report autoupdated paths only after actually updating them (a14c7ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"