equal
deleted
inserted
replaced
2993 |
2993 |
2994 ms = mergestatemod.mergestate.read(self) |
2994 ms = mergestatemod.mergestate.read(self) |
2995 mergeutil.checkunresolved(ms) |
2995 mergeutil.checkunresolved(ms) |
2996 |
2996 |
2997 # internal config: ui.allowemptycommit |
2997 # internal config: ui.allowemptycommit |
2998 allowemptycommit = ( |
2998 if cctx.isempty() and not self.ui.configbool( |
2999 cctx.branch() != cctx.p1().branch() |
2999 b'ui', b'allowemptycommit' |
3000 or extra.get(b'close') |
3000 ): |
3001 or merge |
|
3002 or cctx.files() |
|
3003 or self.ui.configbool(b'ui', b'allowemptycommit') |
|
3004 ) |
|
3005 if not allowemptycommit: |
|
3006 self.ui.debug(b'nothing to commit, clearing merge state\n') |
3001 self.ui.debug(b'nothing to commit, clearing merge state\n') |
3007 ms.reset() |
3002 ms.reset() |
3008 return None |
3003 return None |
3009 |
3004 |
3010 if merge and cctx.deleted(): |
3005 if merge and cctx.deleted(): |