Mercurial > jhg
log
| age | author | description | 
|---|---|---|
| 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 | 
| Wed, 14 Aug 2013 14:51:51 +0200 | Artem Tikhomirov | Refactor: move diff/blame related code to a separate package | 

