diff tests/test-merge1.out @ 1602:fb4149eebdd4

strictly adher to 80 chars per line
author Muli Ben-Yehuda <mulix@mulix.org>
date Wed, 28 Dec 2005 00:27:05 -0600
parents db10b7114de0
children 2da2d46862fb
line wrap: on
line diff