Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1121:14a69c4988cd
NoOptionError is unknown there.
| author | Ollivier Robert <roberto@keltia.freenix.fr> |
|---|---|
| date | Sat, 27 Aug 2005 23:43:13 -0700 |
| parents | 9c918287d10b |
| children | 696851b1bba9 |
comparison
equal
deleted
inserted
replaced
| 1120:df25ee778ac2 | 1121:14a69c4988cd |
|---|