diff tests/test-merge10.out @ 10729:7a5931c5f2dc stable

patch: enhance diff detection regexp, allow '--- ' in patch message
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 18 Mar 2010 18:22:34 +0100
parents f2618cacb485
children
line wrap: on
line diff