diff tests/test-simplemerge.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 96d8a56d4ef9
children ff7253a0d1da
line wrap: on
line diff