mergetools / gvimdiff2on commit Merge branch 'jc/receive-deny-current-branch-fix' into maint (7d483e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"