Mercurial > hg > easyhg-kdiff3

diff kdiff3/src/mergeresultwindow.cpp @ 73:f7dad0aa6146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3-0.9.90-Qt4
author joachim99
date Sun, 14 May 2006 20:09:06 +0000
parents 5bbfe4784324
children
line wrap: on
line diff
--- a/kdiff3/src/mergeresultwindow.cpp	Tue Apr 18 21:16:38 2006 +0000
+++ b/kdiff3/src/mergeresultwindow.cpp	Sun May 14 20:09:06 2006 +0000
@@ -138,7 +138,8 @@
 
    int wsc;
    int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
-   m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
+   if (m_pStatusBar)
+      m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
          .arg(nofUnsolved).arg(wsc) );
 }