Mercurial > jhg
log src/org/tmatesoft/hg/repo/HgMergeState.java @ 712:a864fb309e4b
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 |