Mercurial > evolve
diff tests/test-evolve-templates.t @ 4507:de9089514833 stable
branching: merge default branch in stable to prepare 8.5.0 release
The release is not fully ready, but the merging is non-trivial.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:13:55 +0200 |
| parents | b58e45aa9be2 |
| children | 7a779a288793 30a544904238 |
line wrap: on
line diff
--- a/tests/test-evolve-templates.t Wed Apr 10 16:11:59 2019 +0200 +++ b/tests/test-evolve-templates.t Thu Apr 11 22:13:55 2019 +0200 @@ -245,8 +245,8 @@ o ea207398892e -Test templates with splitted commit -=================================== +Test templates with split commit +================================ $ hg init $TESTTMP/templates-local-split $ cd $TESTTMP/templates-local-split @@ -1313,7 +1313,7 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: ROOT -Diverge one of the splitted commit +Diverge one of the split commit $ hg up 6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved