Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-586 @ 5335:88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 24 Sep 2007 19:00:11 -0300 |
parents | 720ae5085ee3 |
children |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A