Add a test for read-tree -u --reset with a D/F conflict
authorJeff King <peff@peff.net>
Sun, 9 Mar 2008 04:27:04 +0000 (20:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Mar 2008 05:30:05 +0000 (21:30 -0800)
commit50753d00d691c1ea16bc72446705aee2c128fc2f
tree87599cde48d64e3298c4051f3e6eb1d32f63ca01
parent1cbcefb107776ce2da374697bb4f6e2bd22ff73f
Add a test for read-tree -u --reset with a D/F conflict

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t1005-read-tree-reset.sh [new file with mode: 0755]