diff tests/test-rebase-collapse.out @ 7731:737f274d1915

test-merge-tools Some tests of merge-tools configuration and selection, mostly excercising filemerge.py
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 25 Jan 2009 21:20:11 +0100
parents 45495d784ad6
children 49efeed49c94
line wrap: on
line diff