Mercurial > hg-stable
comparison mercurial/filemerge.py @ 37855:79c54e7c0c52 stable
rebase: prioritize indicating an interrupted rebase over update (issue5838)
This should also cover the transplant extension, and any other non clearable
states.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 02 Jun 2018 13:44:44 -0400 |
| parents | a8a902d7176e |
| children | 242eb5132203 |
comparison
equal
deleted
inserted
replaced
| 37854:712d6f535fc9 | 37855:79c54e7c0c52 |
|---|