diff doc/hgmerge.1.txt @ 4052:a8a8ecf909db

Adjust documentation for 78a0dd93db0b (empty username to force specifying it)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 25 Jan 2007 17:57:51 +0100
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff