diff tests/test-conflict.out @ 3060:aa1cee5b8afb

hgk.py: add an optional file list to debug-diff-tree this solves a problem when hgk was trying to display merges diff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 06 Sep 2006 02:13:08 +0200
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line diff