Workaround for differences not showing in status bar (#757206) and fixes crash I...
authorEike Sauer <eike@debian.org>
Sat, 7 May 2016 15:42:00 +0000 (16:42 +0100)
committerEike Sauer <eike@debian.org>
Sat, 7 May 2016 15:42:00 +0000 (16:42 +0100)
commite0114e8e01312e46f791792c9026f02ffc4e5a5b
treeb22b9d8ff4bceb6a7eb281ba69043b8e9d3ee182
parent46b7c0bc8d3f1e11fdc557f657f6ba69f48f6eea
Workaround for differences not showing in status bar (#757206) and fixes crash I had when testing this

Origin: eike@debian.org

Gbp-Pq: Name crash-and-status-line.patch
src-QT4/mergeresultwindow.cpp
src-QT4/mergeresultwindow.h
src-QT4/pdiff.cpp