Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-empty-dir @ 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 hg init echo 123 > a hg add a hg commit -m "first" -d "0 0" a mkdir sub echo 321 > sub/b hg add sub/b hg commit -m "second" -d "0 0" sub/b cat sub/b hg co 0 cat sub/b ls sub true