Mercurial > hg4j
diff COPYING @ 125:26ad21b250e4
Explicit op to tell merge revisions
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 15 Feb 2011 06:40:36 +0100 | 
| parents | a3a2e5deb320 | 
| children | 3ca4ae7bdd38 | 
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Tue, 15 Feb 2011 06:40:36 +0100 | 
| parents | a3a2e5deb320 | 
| children | 3ca4ae7bdd38 |