Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge5.out @ 714:29fcd195e056
age | author | description |
---|---|---|
Mon, 04 Jul 2005 12:38:34 -0800 | maf46 | Fix zombie files in merge |
Tue, 21 Jun 2005 19:14:11 -0800 | mpm | [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted |