Avoid NPE on conflict during gerrit checkout
commit74a4a0e49c9b70dc6053ccb10eb0fef3d6a38c0a
authorAndrey Loskutov <loskutov@gmx.de>
Fri, 3 Feb 2017 08:43:35 +0000 (3 09:43 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 6 Mar 2017 22:07:51 +0000 (6 23:07 +0100)
treed7d24b7ca3135ba1c3529078af89d1833c6230fd
parent1108743049e1d8c071e2d8e7320b423dc35914cd
Avoid NPE on conflict during gerrit checkout

Bug: 511610
Change-Id: Ie1b9de2aed2fbaa255b97a76565c0da417c492e0
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
(cherry picked from commit 8549e454491ed6f37689ead035dd356f3b639e4c)
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java