Mercurial > hg
comparison mercurial/manifest.py @ 27458:d39e743e3578
rebase: mention conflict in documentation instead of merge
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Fri, 18 Dec 2015 18:32:15 +0000 |
| parents | c59647c6694d |
| children | f888676a23d0 |
comparison
equal
deleted
inserted
replaced
| 27457:97cc045f1cfe | 27458:d39e743e3578 |
|---|