mercurial/cext/parsers.c
changeset 47513 10e740292dff
parent 47512 769037a279ec
child 47514 559aee84b889
--- a/mercurial/cext/parsers.c	Sun Jul 04 03:29:20 2021 +0200
+++ b/mercurial/cext/parsers.c	Sat Jul 03 04:07:21 2021 +0200
@@ -155,8 +155,18 @@
 	return PyBytes_FromStringAndSize(&self->state, 1);
 };
 
+static PyObject *dirstatetuple_get_merged(dirstateTupleObject *self)
+{
+	if (self->state == 'm') {
+		Py_RETURN_TRUE;
+	} else {
+		Py_RETURN_FALSE;
+	}
+};
+
 static PyGetSetDef dirstatetuple_getset[] = {
     {"state", (getter)dirstatetuple_get_state, NULL, "state", NULL},
+    {"merged", (getter)dirstatetuple_get_merged, NULL, "merged", NULL},
     {NULL} /* Sentinel */
 };