Mercurial > evolve
comparison tests/test-evolve-templates.t @ 3110:50be10c63825 mercurial-4.0
test-compat: merge with mercurial-4.1 branch
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Oct 2017 18:43:55 +0200 |
parents | 3024ae293732 ddf28837f5af |
children | 706402d70b3f 088ea9b74e47 |
comparison
equal
deleted
inserted
replaced
3109:3024ae293732 | 3110:50be10c63825 |
---|---|
429 @ changeset: 3:65b757b745b9 | 429 @ changeset: 3:65b757b745b9 |
430 | tag: tip | 430 | tag: tip |
431 | parent: 0:ea207398892e | 431 | parent: 0:ea207398892e |
432 | user: test | 432 | user: test |
433 | date: Thu Jan 01 00:00:00 1970 +0000 | 433 | date: Thu Jan 01 00:00:00 1970 +0000 |
434 | trouble: divergent | |
435 | summary: A2 | 434 | summary: A2 |
436 | | 435 | |
437 | o changeset: 2:fdf9bde5129a | 436 | o changeset: 2:fdf9bde5129a |
438 |/ parent: 0:ea207398892e | 437 |/ parent: 0:ea207398892e |
439 | user: test | 438 | user: test |
440 | date: Thu Jan 01 00:00:00 1970 +0000 | 439 | date: Thu Jan 01 00:00:00 1970 +0000 |
441 | trouble: divergent | |
442 | summary: A1 | 440 | summary: A1 |
443 | | 441 | |
444 | x changeset: 1:471f378eab4c | 442 | x changeset: 1:471f378eab4c |
445 |/ user: test | 443 |/ user: test |
446 | date: Thu Jan 01 00:00:00 1970 +0000 | 444 | date: Thu Jan 01 00:00:00 1970 +0000 |