From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2022 00:11:43 +0000 (-0700)
Subject: Merge branch 'rs/diff-caret-bang-with-parents'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=b988427918c767fc7782a387c9c8de9e147b983d;p=rit

Merge branch 'rs/diff-caret-bang-with-parents'

"git diff rev^!" did not show combined diff to go to the rev from
its parents.

* rs/diff-caret-bang-with-parents:
  diff: support ^! for merges
  revisions.txt: unspecify order of resolved parts of ^!
  revision: use strtol_i() for exclude_parent
---

b988427918c767fc7782a387c9c8de9e147b983d