summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-03-08 20:27:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-08 21:30:05 -0800
commit50753d00d691c1ea16bc72446705aee2c128fc2f (patch)
tree87599cde48d64e3298c4051f3e6eb1d32f63ca01 /diff-lib.c
parentMerge branch 'ph/parseopt' (diff)
downloadtgif-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.xz
Add a test for read-tree -u --reset with a D/F conflict
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions