diff mercurial/merge.py @ 4944:10afa3fab6b4

Make [defaults] in .hg/hgrc work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 17:36:45 +0200
parents 931f901ab811
children 6fd953d5faea 60c54154ec4c
line wrap: on
line diff