mergetools / gvimdiff2on commit Merge branch 'jh/checkout-auto-tracking' into maint (74051fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"