Mercurial > hg
diff hgext/children.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 | 80c5b2666a96 |
children | 3501bd89dad2 |
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 18 Dec 2015 18:32:15 +0000 |
parents | 80c5b2666a96 |
children | 3501bd89dad2 |