| commit | 11ecccc1a55fe65ce49b2d9aa6299d91388dbc35 | |
| author | Constantine Plotnikov <Constantine.Plotnikov@jetbrains.com> | |
| Tue, 13 Jan 2009 15:45:39 +0000 (13 18:45 +0300) | ||
| committer | Constantine Plotnikov <Constantine.Plotnikov@jetbrains.com> | |
| Tue, 13 Jan 2009 15:45:39 +0000 (13 18:45 +0300) | ||
| tree | f0892c56e8024b7a8572fb1522adfbbfc5fb288c | treesnapshot (tar.gz zip) |
| parent | 54f10197b8ce63f5ab62745638a7089d830f9b05 | commitdiff |
VCS API moved conflictResolved/2 to MergeSession as it needs status data that is potentially in the merge session