Mercurial > hg
comparison tests/test-simplemerge.py @ 28185:c7e8948627f3
rebase: adds storing collapse message (issue4792)
Before this patch collapse message wasn't stored so when
you ran into the merge conflict while rebasing, running
rebase --continue didn't remember the message and
always opened editor to fill commit message.
This patch adds saving collapse message in
.hg/last-message.txt and restoring it later
when needed.
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Wed, 17 Feb 2016 22:45:01 +0100 |
parents | 56b2bcea2529 |
children | 86db5cb55d46 |
comparison
equal
deleted
inserted
replaced
28184:11c2f8af09c2 | 28185:c7e8948627f3 |
---|