Mercurial > hg
comparison tests/test-double-merge.t @ 18446:c83d36b81df1
rebase: lose the comparison to `nullmerge`
For a proper behavior of the `--rev` revision we will need another possible
state for revision ignored by rebase. We alter the comparison to `nullmerge`
to match this future lower state too.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 18 Jan 2013 23:21:32 +0100 |
| parents | a6fe1b9cc68f |
| children | 5ed6a375e9ca |
comparison
equal
deleted
inserted
replaced
| 18445:4d92e2d75cff | 18446:c83d36b81df1 |
|---|