view tests/test-simplemerge-cmd.out @ 5593:6ae8ed59c7b4

Fix breaking test from 05451f6b5f07
author Bryan O'Sullivan <bos@serpentine.com>
date Sun, 02 Dec 2007 21:52:40 -0800
parents ea7b982b6c08
children e1f4343db740
line wrap: on
line source

(binary:application/octet-stream)