comparison tests/test-merge1 @ 2953:3d5547845158

fix issue 322. do not allow to add files that shadow files or directories already in dirstate.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 18 Aug 2006 21:03:29 -0700
parents e506c14382fd
children 49966b5ab16f
comparison
equal deleted inserted replaced
2949:7356fa3cff2c 2953:3d5547845158