Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hgmerge.1.txt @ 790:d7380783a086
Make test-pull work on slow machines, where hg serve needs some time to start.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 23 Jul 2005 17:09:37 +0100 |
| parents | c084cfbb2389 |
| children | 3ab6e55ee361 |
comparison
equal
deleted
inserted
replaced
| 789:8162ff905b33 | 790:d7380783a086 |
|---|