view tests/test-merge5.out @ 1453:6fbb13b7a59f

get command defaults from hgrc
author TK Soh <>
date Wed, 26 Oct 2005 16:10:36 -0700
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

removing b
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)