Mercurial > hg
comparison tests/test-simplemerge.py.out @ 5672:8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Dec 2007 13:39:03 +0100 |
parents | 2e3c54fb79a3 |
children | f18830651811 |
comparison
equal
deleted
inserted
replaced
5671:b5605d88dc27 | 5672:8a65ea986755 |
---|