diff tests/test-merge7.out @ 7534:5aca12729a0d

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
author Christian Ebert <blacktrash@gmx.net>
date Tue, 16 Dec 2008 09:58:41 +0100
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff