diff tests/test-simplemerge-cmd @ 5593:6ae8ed59c7b4

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