Mercurial > odfcast
comparison mergeclient.py @ 81:9ad8421dafb4 1.1
merge
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Mon, 09 Mar 2015 17:07:48 +0100 |
| parents | 4645e50539ff |
| children | 349d49bb69f4 |
comparison
equal
deleted
inserted
replaced
| 80:ae2f4e1c4ab0 | 81:9ad8421dafb4 |
|---|