Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 4511:1d46169ec197
Fixed test output for changed glog (. instead of @)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 06 Jun 2007 19:06:43 +0200 |
| parents | 6a03cff2b0f5 |
| children | e4480f2b61e9 |
comparison
equal
deleted
inserted
replaced
| 4510:e0bc2c575044 | 4511:1d46169ec197 |
|---|