Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3.out @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 61ed30e82b27 |
children | 122449dd89db |
line wrap: on
line source
+ hg init + echo This is file a1 + hg add a + hg commit -m 'commit #0' -d '0 0' + touch b + hg add b + rm b + hg commit -A '-mcomment #1' -d '0 0' removing b b never committed!