Mercurial > hg > mercurial-crew-with-dirclash
diff templates/map @ 829:764b0350acb8
Shortened hgmerge a little bit.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:16:41 +0100 |
parents | d2422f10c136 |
children | c333dfa8fa1a c2e77581bc84 |