Mercurial > jhg

log src/org/tmatesoft/hg/core/HgMergeCommand.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Thu, 15 Aug 2013 18:43:50 +0200 Artem Tikhomirov Merge command: implement conflict resolution alternatives
Wed, 14 Aug 2013 20:07:26 +0200 Artem Tikhomirov Merge command introduced
less more | (0) tip