mergetools / gvimdiff2on commit Merge branch 'jk/interpret-branch-name-fix' into maint (21261fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"