# HG changeset patch
# User Chris Cannam
# Date 1341306524 -3600
# Node ID 10ef94e51f44155f080aaf1eae13cc035a11d16e
# Parent  92929d26b8db010c293a60b4a56ed2a8d1a75f08
Make sure we update the view after a failed merge

diff -r 92929d26b8db -r 10ef94e51f44 src/fswatcher.cpp
--- a/src/fswatcher.cpp	Tue Jul 03 10:02:22 2012 +0100
+++ b/src/fswatcher.cpp	Tue Jul 03 10:08:44 2012 +0100
@@ -28,7 +28,7 @@
 
 #include <deque>
 
-#define DEBUG_FSWATCHER 1
+//#define DEBUG_FSWATCHER 1
 
 /*
  * Watching the filesystem is trickier than it seems at first glance.
diff -r 92929d26b8db -r 10ef94e51f44 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Tue Jul 03 10:02:22 2012 +0100
+++ b/src/mainwindow.cpp	Tue Jul 03 10:08:44 2012 +0100
@@ -2133,6 +2133,7 @@
              tr("Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu."),
              stdErr);
         m_mergeCommitComment = "";
+        hgQueryPaths();
         return;
     case ACT_STAT:
         break; // go on to default report