diff tests/test-merge-local @ 5593:6ae8ed59c7b4

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