| commit | 63ccba1ec77329d99eb3c7c577f1629a44fba712 | |
| author | Irina Chernushina <Irina.Chernushina@jetbrains.com> | |
| Fri, 8 May 2009 16:01:33 +0000 (8 20:01 +0400) | ||
| committer | Irina Chernushina <Irina.Chernushina@jetbrains.com> | |
| Fri, 8 May 2009 16:01:33 +0000 (8 20:01 +0400) | ||
| tree | 2733f6d38d453e2154d37b30eed2c5aebfa5d43c | treesnapshot (tar.gz zip) |
| parent | 736d659c9ce00cf09a1fc1164f851aad77eeda0f | commitdiff |
SVN: when mark that text conflict is merged, do not mark properties are merged
| vcs-api/src/com/intellij/openapi/vcs/merge/MergeProvider.java | diffblobblamehistory |