From: Junio C Hamano Date: Wed, 26 Oct 2022 00:11:43 +0000 (-0700) Subject: Merge branch 'rs/diff-caret-bang-with-parents' X-Git-Tag: v2.39.0-rc0~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b988427918c767fc7782a387c9c8de9e147b983d;p=thirdparty%2Fgit.git 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