Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 5097:f0c18ad24273 stable
tests: allow an empty merge commit to have tests pass without too many changes
Not the greatest fix, but this allows us to have the same test case for all
versions of Mercurial.
Hash of 29 changes because instead of both parents only one is set in hg 5.3.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 27 Jan 2020 14:55:35 +0700 |
| parents | b6c819facbe8 |
| children | b2de5825e5ca |
comparison
equal
deleted
inserted
replaced
| 5096:6742ce189373 | 5097:f0c18ad24273 |
|---|