summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
commitec3f7d5d0f3676aa9634ee30f8c9e55893a8c505 (patch)
treeb51c8a2a902b671d0336a61276c0ae8f9b423836 /Documentation/merge-config.txt
parentMerge branch 'jl/add-p-reverse-message' (diff)
parentInterix: add configure checks (diff)
downloadtgif-ec3f7d5d0f3676aa9634ee30f8c9e55893a8c505.tar.xz
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 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions