mergetools / gvimdiff2on commit t/t2021-checkout-last: "checkout -" should work after a rebase finishes (89f2fea)
   1. "$MERGE_TOOLS_DIR/vimdiff"