comparison tests/test-branch-tag-confict.t @ 42149:84b5ad5fc2aa stable

merge: forgot to pull before release These two changes should be part of 5.0, but we are fine leaving them out of the RC.
author Augie Fackler <augie@google.com>
date Wed, 17 Apr 2019 14:10:02 -0400
parents f2719b387380
children
comparison
equal deleted inserted replaced
42146:e76eb64d7f71 42149:84b5ad5fc2aa