Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 3195:f8e67b7c57a4
Remove unneeded (and bashismic) export HGMERGE=true.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 30 Sep 2006 09:39:44 +0200 |
parents | a9e75b371315 |
children | e67c22bc8bba |