Mercurial > jhg
log cmdline/org/tmatesoft/hg/console/Merge.java @ 712:a864fb309e4b
age | author | description |
---|---|---|
Fri, 16 Aug 2013 14:54:09 +0200 | Artem Tikhomirov | Merge: tests for mediator notifications |
Thu, 15 Aug 2013 18:43:50 +0200 | Artem Tikhomirov | Merge command: implement conflict resolution alternatives |