Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 804:19388dcbac49
Incorporated most of Aron Griffis suggestions for sh compatibility.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 21:50:05 +0100 |
parents | c084cfbb2389 |
children | 3ab6e55ee361 |