diff mercurial/ancestor.py @ 3389:efbe24c7d8d9

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 14 Oct 2006 10:53:29 +0200
parents b1db258e875c
children eb0b4a2d70a9
line wrap: on
line diff