From a31e5c10969a7ef72d10e30d838c2054bd728079 Mon Sep 17 00:00:00 2001
From: Siddharth Agarwal <sid0@fb.com>
Date: Sun, 3 Jan 2016 22:26:32 -0800
Subject: [PATCH] test-mergedriver.t: update --clean in between failing merges

Mercurial changeset e96bb53bb99a changed things so that if there were
unresolved conflicts you could no longer do another merge.
---
 tests/test-mergedriver.t | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test-mergedriver.t b/tests/test-mergedriver.t
index 54b8698afa..ffa3892317 100644
--- a/tests/test-mergedriver.t
+++ b/tests/test-mergedriver.t
@@ -462,6 +462,8 @@ test some other failure modes
   $ hg merge 1 --config experimental.mergedriver=fail
   abort: merge driver must be a python hook
   [255]
+  $ hg update --clean 2
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 this should proceed as if there's no merge driver
   $ hg merge 1 --config experimental.mergedriver=python:fail
   loading preprocess hook failed: