# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-02-28 18:49:13
# Node ID 6cf92d6c0ad514f94c4eb710caa5580f69439eb5
# Parent  f6798c1a80fabeed813aeccf160a70c28619d730

tests: add test of committing with conflicts but no changes in wdir

I'm about to change the behavior slightly here, so let's have a test
that shows that.

Differential Revision: https://phab.mercurial-scm.org/D8194

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -343,6 +343,22 @@ File conflict is not allowed
   $ hg resolve -l
   U a
 
+Try to make empty commit while there are conflicts
+  $ hg revert -r . a
+  $ rm a.orig
+  $ hg ci -m empty
+  nothing changed
+  [1]
+  $ hg resolve -m a
+  (no more unresolved files)
+  $ hg resolve -l
+  R a
+  $ hg ci -m empty
+  nothing changed
+  [1]
+  $ hg resolve -l
+  R a
+
 Change/delete conflict is not allowed
   $ hg up -qC 3
   $ hg rm foo