comparison doc/hgrc.5.txt @ 792:49ec802b4a16

Added tests for bug with three-way-merging of old tip, tip and cwd.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jul 2005 17:14:05 +0100
parents 574869103985
children 54b2a42e501e f15901d053e1
comparison
equal deleted inserted replaced
791:040655ea0cc4 792:49ec802b4a16