Show More
@@ -2956,6 +2956,7 b' class localrepository(object):' | |||
|
2956 | 2956 | or self.ui.configbool(b'ui', b'allowemptycommit') |
|
2957 | 2957 | ) |
|
2958 | 2958 | if not allowemptycommit: |
|
2959 | self.ui.debug(b'nothing to commit, clearing merge state\n') | |
|
2959 | 2960 | ms.reset() |
|
2960 | 2961 | return None |
|
2961 | 2962 |
@@ -758,6 +758,7 b' Transplants of grafts can find a destina' | |||
|
758 | 758 | branchmerge: True, force: True, partial: False |
|
759 | 759 | ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
|
760 | 760 | starting 4 threads for background file closing (?) |
|
761 | nothing to commit, clearing merge state | |
|
761 | 762 | note: graft of 13:7a4785234d87 created no changes to commit |
|
762 | 763 | $ hg log -r 'destination(13)' |
|
763 | 764 | All copies of a cset |
General Comments 0
You need to be logged in to leave comments.
Login now