view tests/test-merge2.out @ 3488:40fabb2a64b8

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

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b