Mercurial > hg4j
log
| age | author | description |
|---|---|---|
| Wed, 21 Aug 2013 16:23:27 +0200 | Artem Tikhomirov | Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always |
| Tue, 20 Aug 2013 18:41:34 +0200 | Artem Tikhomirov | Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed |
| Fri, 16 Aug 2013 19:22:59 +0200 | Artem Tikhomirov | Merge: support 'unresolved' resolution with MergeStateBuilder |
| Fri, 16 Aug 2013 14:54:09 +0200 | Artem Tikhomirov | Merge: tests for mediator notifications |
| Thu, 15 Aug 2013 18:43:50 +0200 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |
| Wed, 14 Aug 2013 20:07:26 +0200 | Artem Tikhomirov | Merge command introduced |