IDEA-51501 Fixed "The unmerged file is not found" assertion
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 12:20:20 +0000 (15:20 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 20 Mar 2011 12:20:20 +0000 (15:20 +0300)
commit55d35cf8f29b48cb7b666b4e439a22f5df429147
tree0e57f84ed4f78d2477664040bf8af7037e72b265
parent34ad557c363f2abe00cf969b9b7017568166c026
IDEA-51501 Fixed "The unmerged file is not found" assertion

In the case of rename conflict, there would be the old file name along with the new file name in the list of unmerged files. There is no file with the old name anymore, thus assertion failed.
No more assertion - just ignore old names.
plugins/git4idea/src/git4idea/changes/GitChangeUtils.java