Mercurial > hg
comparison tests/test-simplemerge.py.out @ 20860:81d6dc8c3c63
merge with stable
This should correct an earlier couple of bad merges (5433856b2558 and
596960a4ad0d, now pruned) that accidentally brought in a change that had
been marked obsolete (244ac996a821).
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Mon, 31 Mar 2014 10:12:07 -0500 |
| parents | 2e3c54fb79a3 |
| children | f18830651811 |
comparison
equal
deleted
inserted
replaced
| 20856:8a6a86c9a5b5 | 20860:81d6dc8c3c63 |
|---|