Mercurial > hg
comparison hgmerge @ 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 | 6a03cff2b0f5 |
children | e4480f2b61e9 |
comparison
equal
deleted
inserted
replaced
3388:5eecae4ff722 | 3389:efbe24c7d8d9 |
---|