Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-backwards-remove @ 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 | 7e4843b7efd2 |
children | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
#!/bin/sh -x hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" ls echo This is file b1 > b hg add b hg commit -m "commit #1" -d "0 0" hg co 0 # B should disappear ls