Mercurial > jhg

log src/org/tmatesoft/hg/repo/HgMergeState.java @ 713:661e77dc88ba tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -3 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
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
less more | (0) -10 -3 tip