Mercurial > hg
diff tests/test-lfs.t @ 36760:7bf80d9d9543
merge with stable
There were a handful of merge conflicts in the wire protocol code due
to significant refactoring in default. When resolving the conflicts,
I tried to produce the minimal number of changes to make the incoming
security patches work with the new code.
I will send some follow-up commits to get the security patches better
integrated into default.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 06 Mar 2018 14:32:14 -0800 |
| parents | 7bc33d677c0c d031609b3cb7 |
| children | f4e84dfc06fd |
line wrap: on
line diff
--- a/tests/test-lfs.t Sun Mar 04 21:16:36 2018 -0500 +++ b/tests/test-lfs.t Tue Mar 06 14:32:14 2018 -0800 @@ -371,7 +371,7 @@ uncompressed size of bundle content: * (changelog) (glob) * (manifests) (glob) - * a (glob) + * a (glob) $ hg --config extensions.strip= strip -r 2 --no-backup --force -q $ hg -R bundle.hg log -p -T '{rev} {desc}\n' a 5 branching