changeset 51144 | 9ff3d5395d6b |
parent 49477 | f3cd2d6eeef9 |
--- a/tests/test-log.t Wed Nov 15 02:39:53 2023 +0100 +++ b/tests/test-log.t Tue Nov 14 22:47:17 2023 +0100 @@ -2001,6 +2001,8 @@ @@ -0,0 +1,1 @@ +b + $ hg log -r 3 -T'{diffstat}\n' + 2: +2/-1 Test that diff.merge is respected (file b was added on one side and and therefore merged cleanly) @@ -2021,6 +2023,9 @@ -b +c + $ hg log -r 3 -T'{diffstat}\n' --config diff.merge=yes + 1: +1/-1 + $ cd .. 'hg log -r rev fn' when last(filelog(fn)) != rev