diff tests/test-conflict.out @ 6910:93609576244e

Debashify rebase tests
author Brendan Cully <brendan@kublai.com>
date Tue, 19 Aug 2008 18:07:26 -0700
parents 92ccccb55ba3
children 9fe7e6acf525
line wrap: on
line diff