diff tests/test-merge1.out @ 2184:2477a7183a6f

Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'. Add an explicit description of 'hg commit --addremove'.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 03 May 2006 10:53:51 +0200
parents b2ae81a7df29
children a31557193f3c
line wrap: on
line diff