# HG changeset patch
# User Manuel Jacob
# Date 1591323037 -7200
# Fri Jun 05 04:10:37 2020 +0200
# Branch stable
# Node ID 6a4e16808cadfd122312e69728c776baa7142243
# Parent 2dc5ae953c4a8265578acbe7d3e26c93ec8a08fb
# EXP-Topic fix_indentation
tests: fix indentation
diff --git a/tests/test-b
# HG changeset patch
# User Yuya Nishihara
# Date 1591101897 -32400
# Tue Jun 02 21:44:57 2020 +0900
# Node ID 970abb8ea2a2d6a086ebfdd9a1130b2fb777640e
# Parent dba0ac9b68381e9610f25d9991bd623f85cbdefd
simplemerge: rewrite flag merging loop as expression
I feel binary operations are more re
# HG changeset patch
# User Yuya Nishihara
# Date 1591101649 -32400
# Tue Jun 02 21:40:49 2020 +0900
# Node ID dba0ac9b68381e9610f25d9991bd623f85cbdefd
# Parent 8e111a6aabc5efd7ef414b9b1b6fa46eeaa569f4
simplemerge: leverage pycompat function to convert byte string to set
diff --git a/mercur
# HG changeset patch
# User Yuya Nishihara
# Date 1591101547 -32400
# Tue Jun 02 21:39:07 2020 +0900
# Node ID 8e111a6aabc5efd7ef414b9b1b6fa46eeaa569f4
# Parent 03ba7de6a8b9ab339a6dafab969e890228b4c2f1
simplemerge: fix function name that tests if ctx is not null revision
diff --git a/mercur
On Thu, 04 Jun 2020 07:54:14 +0200, Manuel Jacob wrote:
> On 2020-06-03 22:40, Augie Fackler wrote:
> >> On Jun 3, 2020, at 07:13, Yuya Nishihara wrote:
> >> Flushing stdout per write() sounds bad. If that's the only way to work
> >> around Py3 io module, we'll probably need to check if the stdout
Yuya Nishihara a écrit :
> On Wed, 03 Jun 2020 05:46:05 +0200, Manuel Jacob wrote:
> > On 2020-06-03 00:04, Augie Fackler wrote:
> > >> On Jun 2, 2020, at 14:07, Manuel Jacob wrote:
> > >>
> > >> # HG changeset patch
> > >> # User Manuel Jacob
> > >> # Date 1591120869 -7200
> > >> # Tue Jun
