diff hgrunner.cpp @ 195:ff0d76dcb3b8

* Don't close proc input on finished() -- causes crash on program failure on Windows
 * Use merge binary from settings, even if empty -- sometimes user may wish to set an empty string to avoid having an external merge program
 * Revert labels to line edits in settings dialog, for a similar reason (permit setting empty value)
 * Avoid showing hard hyphens on Windows, they don't look right
 * Use preformatted text for merge outcome dialog (but format3 would be better)

--- a/hgrunner.cpp	Mon Dec 20 22:39:45 2010 +0000
+++ b/hgrunner.cpp	Fri Dec 24 13:14:45 2010 +0000
@@ -348,7 +348,7 @@
     m_isRunning = false;
     m_currentAction = HgAction();
 
-    closeProcInput();
+    //closeProcInput();
     m_proc->deleteLater();
     m_proc = 0;