Mercurial > jhg
diff src/org/tmatesoft/hg/repo/package.html @ 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 | d56ea1a2537a |
children |