merge: fix NPE if UndoManager not found appcode/142.4266 clion/142.4264
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Tue, 25 Aug 2015 12:02:52 +0000 (15:02 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Tue, 25 Aug 2015 12:02:52 +0000 (15:02 +0300)
commit5b6c41cdef413bd5c5df388895ec642c05ea4435
tree784e0deae3e5ffaba94070240cdfb0cc2cc59048
parent07e19a683bd570d38a58f0083d90064d9dc2c9aa
merge: fix NPE if UndoManager not found
platform/diff-impl/src/com/intellij/diff/merge/TextMergeTool.java