Mercurial > hg
view tests/test-issue619.out @ 7971:6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
author | Vsevolod Solovyov <vsevolod.solovyov@gmail.com> |
---|---|
date | Tue, 24 Mar 2009 23:28:55 +0000 |
parents | cdc458b12f0f |
children | 5b48d819d5f9 |
line wrap: on
line source
adding a marked working directory as branch b adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved fast-forward 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bogus fast-forward should fail abort: can't merge with ancestor done