diff tests/test-static-http.out @ 1581:db10b7114de0

abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents e89033eb90a5
children 0b3f4be5c5bf 7d83a351a936
line wrap: on
line diff