mergetools / gvimdiffon commit Merge branch 'kb/config-unmap-before-renaming' into maint (6f402a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"