mergetools / gvimdiff3on commit merge: add merge.renames config setting (85b4603)
   1. "$MERGE_TOOLS_DIR/vimdiff"