##// END OF EJS Templates
rebase: adds storing collapse message (issue4792)...
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.

File last commit:

r27535:0d0f4070 default
r28185:c7e89486 default
Show More
test-demandimport.py.out
19 lines | 671 B | text/plain | TextLexer
/ tests / test-demandimport.py.out
os = <unloaded module 'os'>
os.system = <built-in function system>
os = <module 'os' from '?'>
util = <unloaded module 'util'>
util.system = <function system at 0x?>
util = <module 'mercurial.util' from '?'>
util.system = <function system at 0x?>
hgweb = <unloaded module 'hgweb'>
hgweb_mod = <unloaded module 'hgweb_mod'>
hgweb = <module 'mercurial.hgweb' from '?'>
fred = <unloaded module 're'>
re = <unloaded module 'sys'>
fred = <unloaded module 're'>
fred.sub = <function sub at 0x?>
fred = <proxied module 're'>
re = <unloaded module 'sys'>
re.stderr = <open file '<whatever>', mode 'w' at 0x?>
re = <proxied module 'sys'>
node = <module 'mercurial.node' from '?'>