mergetools / gvimdiffon commit Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint (a28e876)
   1. "$MERGE_TOOLS_DIR/vimdiff"