Mercurial > hg
view tests/test-merge5.out @ 3202:f8e67b7c57a4
Remove unneeded (and bashismic) export HGMERGE=true.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 30 Sep 2006 09:39:44 +0200 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes