Mercurial > hg
diff tests/test-rebase-conflicts.t @ 29757:976cd337cac9
changegroup: move branch cache debug message to proper location
Before, we logged about performing a branch cache update when we
weren't actually doing it. Fix that.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 08 Aug 2016 22:06:07 -0700 |
parents | a2a380e2750f |
children | 3e7ded768556 |
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t Mon Aug 08 18:05:10 2016 +0200 +++ b/tests/test-rebase-conflicts.t Mon Aug 08 22:06:07 2016 -0700 @@ -304,7 +304,6 @@ invalid branchheads cache (served): tip differs history modification detected - truncating revision branch cache to revision 9 rebase completed - updating the branch cache truncating cache/rbc-revs-v1 to 72 Test minimization of merge conflicts