comparison tests/test-merge4 @ 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 e506c14382fd
children
comparison
equal deleted inserted replaced
4535:121999244123 4536:720ae5085ee3