Mercurial > hg4j
diff cmdline/org/tmatesoft/hg/console/Merge.java @ 705:b4242b7e7dfe
Merge command: implement conflict resolution alternatives
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 15 Aug 2013 18:43:50 +0200 |
| parents | 7743a9c10bfa |
| children | cd5c87d96315 |
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/Merge.java Wed Aug 14 20:07:26 2013 +0200 +++ b/cmdline/org/tmatesoft/hg/console/Merge.java Thu Aug 15 18:43:50 2013 +0200 @@ -56,8 +56,8 @@ static class Dump implements HgMergeCommand.Mediator { - public void same(HgFileRevision first, HgFileRevision second, Resolver resolver) throws HgCallbackTargetException { - System.out.printf("Unchanged %s:%s", first.getPath(), first.getRevision().shortNotation()); + public void same(HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException { + System.out.printf("Unchanged %s:%s", rev.getPath(), rev.getRevision().shortNotation()); } public void onlyA(HgFileRevision base, HgFileRevision rev, Resolver resolver) throws HgCallbackTargetException {