Mercurial > hg
diff mercurial/verify.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 | 8462d7f2c4fe |
children | f6457349985b |
author | timeless <timeless@mozdev.org> |
---|---|
date | Fri, 18 Dec 2015 18:32:15 +0000 |
parents | 8462d7f2c4fe |
children | f6457349985b |