Mercurial > jhg
diff build.xml @ 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 | 992fa84e7885 | 
| children | cd5c87d96315 | 
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 15 Aug 2013 18:43:50 +0200 | 
| parents | 992fa84e7885 | 
| children | cd5c87d96315 |