Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4536:720ae5085ee3
commit: fix bug where dirstate for removed file is confused
This fixes issue586
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 10 Jun 2007 21:16:58 -0500 |
parents | 0912d8df5e19 |
children | 66ed92ed115a |