summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
commitec3f7d5d0f3676aa9634ee30f8c9e55893a8c505 (patch)
treeb51c8a2a902b671d0336a61276c0ae8f9b423836 /diffcore-pickaxe.c
parent1aa6583cc257f3b0570cbc25c89a54f0e4417ef6 (diff)
parent25fe66f84cea9c2e0a7f6b53180542784b94485a (diff)
downloadgit-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.tar.gz
Merge branch 'md/interix'
* md/interix: Interix: add configure checks add support for the SUA layer (interix; windows) Conflicts: git-compat-util.h
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions