log

age author description
2013-08-20 Artem Tikhomirov Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed
2013-08-16 Artem Tikhomirov Merge: support 'unresolved' resolution with MergeStateBuilder
2013-08-16 Artem Tikhomirov Merge: tests for mediator notifications
2013-08-15 Artem Tikhomirov Merge command: implement conflict resolution alternatives
2013-08-14 Artem Tikhomirov Merge command introduced
2013-08-14 Artem Tikhomirov Refactor: move diff/blame related code to a separate package
Loading...