Mercurial > hg4j
diff test-data/test-repos.jar @ 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 | 72fc7774b87e |
children | cd5c87d96315 |