Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1963:39eb64b23cb5
Don't require the "yes" command for test-merge5.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 15 Mar 2006 11:26:57 +0100 |
| parents | c4d577262d00 |
| children | 6a03cff2b0f5 |
comparison
equal
deleted
inserted
replaced
| 1962:2a676ad52c22 | 1963:39eb64b23cb5 |
|---|