Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hgmerge.1.txt @ 1855:0ba9dee8cfbd
Fixed spacing/indentation, removed #! script header, added short description.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 08 Mar 2006 05:16:36 +0100 |
| parents | 3ab6e55ee361 |
| children | 345bac2bc4ec |
comparison
equal
deleted
inserted
replaced
| 1854:638b1bc6c6c9 | 1855:0ba9dee8cfbd |
|---|