Mercurial > jhg
log src/org/tmatesoft/hg/internal/MergeStateBuilder.java @ 711:a62079bc422b
age | author | description |
---|---|---|
2013-08-16 | Artem Tikhomirov | Merge: support 'unresolved' resolution with MergeStateBuilder |
2013-08-15 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |