diff tests/test-merge-revert.out @ 1501:c5c4381d898b

Merge from Hidetaka Iwai
author Matt Mackall <mpm@selenic.com>
date Thu, 03 Nov 2005 14:19:54 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff