summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 01:07:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 01:07:33 (GMT)
commitfa2376f3c89ae59f33e50e0e5769dec2652e9568 (patch)
tree77d2d776bf566ac7587529a1f60595eba89db449 /xdiff
parentc93be3b539da06e2d89d613448dfadf83c48de53 (diff)
parent0d7a6e4ef9e2dc458a9a56ab73638d97f4e75d87 (diff)
downloadgit-fa2376f3c89ae59f33e50e0e5769dec2652e9568.zip
git-fa2376f3c89ae59f33e50e0e5769dec2652e9568.tar.gz
git-fa2376f3c89ae59f33e50e0e5769dec2652e9568.tar.bz2
Merge branch 'maint'
* maint: Clarify fetch error for missing objects. Move Fink and Ports check to after config file Conflicts: Makefile
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions