git4idea: IDEADEV-40577: The ignored unmerged files are now reported.
commit45687fefb1be26c954d0bc0d5fbb2fce47fa8cf7
authorConstantine Plotnikov <constantine.plotnikov@gmail.com>
Fri, 9 Oct 2009 15:10:24 +0000 (9 19:10 +0400)
committerConstantine Plotnikov <constantine.plotnikov@gmail.com>
Mon, 12 Oct 2009 13:37:41 +0000 (12 17:37 +0400)
treef77123786285e56c03ee1bcab4b79e623d49c728
parent45d0625459f54bdf512c107e8962ced8a16da795
git4idea: IDEADEV-40577: The ignored unmerged files are now reported.
plugins/git4idea/src/git4idea/changes/ChangeCollector.java