Mercurial > hg4j
log src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 711:a62079bc422b
age | author | description |
---|---|---|
Fri, 16 Aug 2013 19:22:59 +0200 | Artem Tikhomirov | Merge: support 'unresolved' resolution with MergeStateBuilder |
Thu, 15 Aug 2013 18:43:50 +0200 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |