Merge merge tool fixes for 121.
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:32:26 +0000 (19:32 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 10 Aug 2012 15:32:26 +0000 (19:32 +0400)
commit05253be2b91e7515ed4bba27bd20ad79f78cda97
tree25ecdf5bc52794a7d453bea6ab59fc37f6f8bc23
parent999fcb6084f05788b743314f109644896673b337
parentc8770ead5e79eb7b529dd819a9f7ef9a2e1ae27c
Merge merge tool fixes for 121.