diff tests/test-merge-prompt.out @ 7612:069b29656401

web: use the correct filectx in filelog
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 09 Jan 2009 17:34:06 +0100
parents 4b0c9c674707
children 01ada7b1861d
line wrap: on
line diff