view tests/test-merge-revert.out @ 2163:278f9b13c39a

SunOS fix: Replaced $PWD with `pwd` under certain conditioins $PWD isn't up to date, observed on SunOS 5.8
author Sascha Wilde <wilde@sha-bang.de>
date Sun, 30 Apr 2006 19:29:57 +0200
parents c9226bcc288d
children b2ae81a7df29
line wrap: on
line source

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
? file1.orig
016807e6fdaf tip
merging file1
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip