Mercurial > hg > easyhg-kdiff3

comparison 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
comparison
equal deleted inserted replaced
72:2bb0f4dc64c0 73:f7dad0aa6146
136 update(); 136 update();
137 updateSourceMask(); 137 updateSourceMask();
138 138
139 int wsc; 139 int wsc;
140 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); 140 int nofUnsolved = getNrOfUnsolvedConflicts(&wsc);
141 m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)") 141 if (m_pStatusBar)
142 m_pStatusBar->message( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)")
142 .arg(nofUnsolved).arg(wsc) ); 143 .arg(nofUnsolved).arg(wsc) );
143 } 144 }
144 145
145 void MergeResultWindow::reset() 146 void MergeResultWindow::reset()
146 { 147 {