comparison doc/hgmerge.1.txt @ 3474:bbfb392b2b1a

Fix "templater object got multiple values for keyword argument 'motd'" caused by adding motd to the call to the index template (2896ce093ec4)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Oct 2006 20:51:24 +0200
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3473:2896ce093ec4 3474:bbfb392b2b1a