diff tests/test-merge6.out @ 1600:728fd9584993

add --update support to 'hg unbundle'
author Muli Ben-Yehuda <mulix@mulix.org>
date Tue, 27 Dec 2005 16:16:06 -0600
parents 9344f5dd4488
children ced2d3620f95
line wrap: on
line diff