Mercurial > hg
diff tests/test-rebase-conflicts.t @ 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 | 5936058f6bad |
| children | 19d6fec60b81 |