Mercurial > jhg

log test/org/tmatesoft/hg/test/TestMerge.java @ 713:661e77dc88ba tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
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
less more | (0) tip