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