| commit | 03b8588e1a19728dd486943b52a45fafdbec59b2 | |
| author | Irina Chernushina <Irina.Chernushina@jetbrains.com> | |
| Sat, 12 Jul 2008 16:05:45 +0000 (12 20:05 +0400) | ||
| committer | Irina Chernushina <Irina.Chernushina@jetbrains.com> | |
| Sat, 12 Jul 2008 16:05:45 +0000 (12 20:05 +0400) | ||
| tree | 1abaf606f4ab54ed6b355f157015ba4c1190191b | treesnapshot (tar.gz zip) |
| parent | bd3acfdd597a0026fcb0ea8a5a1fc525a4e6da3b | commitdiff |
SVN: use ancestry parameter for merge file (for IDEA-12035 SVN: "Resolve Text Conflict" creates an EMPTY merge result)