| 567 | } |
| 568 | |
| 569 | bool MergeResultWindow::isDeltaBelowCurrent() const |
| 570 | { |
| 571 | const bool bSkipWhiteConflicts = !gOptions->m_bShowWhiteSpace; |
| 572 | if(m_mergeBlockList.empty()) return false; |
| 573 | |
| 574 | MergeBlockList::const_iterator i = m_currentMergeBlockIt; |
| 575 | if(i != m_mergeBlockList.end()) |
| 576 | { |
| 577 | ++i; |
| 578 | for(; i != m_mergeBlockList.end(); ++i) |
| 579 | { |
| 580 | if(i->isDelta() && !checkOverviewIgnore(i) && !(bSkipWhiteConflicts && i->isWhiteSpaceConflict())) return true; |
| 581 | } |
| 582 | } |
| 583 | return false; |
| 584 | } |
| 585 | |
| 586 | bool MergeResultWindow::isConflictAboveCurrent() const |
| 587 | { |
no test coverage detected