diff -r defabf63e969 -r 8ff1ecfadcd1 mercurial/hg.py --- a/mercurial/hg.py Tue Oct 08 15:15:37 2019 -0700 +++ b/mercurial/hg.py Tue Oct 08 15:06:18 2019 -0700 @@ -379,7 +379,7 @@ """ default = defaultpath or sourcerepo.ui.config(b'paths', b'default') if default: - template = b'[paths]\n' b'default = %s\n' + template = b'[paths]\ndefault = %s\n' destrepo.vfs.write(b'hgrc', util.tonativeeol(template % default)) if repositorymod.NARROW_REQUIREMENT in sourcerepo.requirements: with destrepo.wlock(): @@ -1182,9 +1182,7 @@ # there were no conficts, mergestate was not stored node = repo[b'.'].hex() - repo.ui.status( - _(b"aborting the merge, updating back to" b" %s\n") % node[:12] - ) + repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0