Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 2949:7356fa3cff2c
add other dir/file case to test for issue322.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 18 Aug 2006 15:53:14 -0700 |
parents | 6a03cff2b0f5 |
children | e4480f2b61e9 |
comparison
equal
deleted
inserted
replaced
2946:a7a9ba7a9f48 | 2949:7356fa3cff2c |
---|