tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 21 Oct 2006 20:51:24 +0200
changeset 3474 bbfb392b2b1a
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Fix "templater object got multiple values for keyword argument 'motd'" caused by adding motd to the call to the index template (2896ce093ec4)

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes