diff tests/test-merge3 @ 3488:40fabb2a64b8

zsh: add -r to parents
author Brendan Cully <brendan@kublai.com>
date Tue, 24 Oct 2006 11:10:04 -0700
parents 7544700fd931
children
line wrap: on
line diff