summaryrefslogtreecommitdiff
path: root/config.mak.in
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-03-09 04:27:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-09 05:30:05 (GMT)
commit50753d00d691c1ea16bc72446705aee2c128fc2f (patch)
tree87599cde48d64e3298c4051f3e6eb1d32f63ca01 /config.mak.in
parent1cbcefb107776ce2da374697bb4f6e2bd22ff73f (diff)
downloadgit-50753d00d691c1ea16bc72446705aee2c128fc2f.zip
git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.gz
git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.bz2
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 'config.mak.in')
0 files changed, 0 insertions, 0 deletions