summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:46:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 14:46:08 -0700
commit5758b25da43c401cad33f3304f78084a0305d21c (patch)
treee10e86da5fd7b1c0f13306e289a065bae336e38e /builtin-merge-recursive.c
parentMerge branch 'maint' (diff)
parentarchive test: attributes (diff)
downloadtgif-5758b25da43c401cad33f3304f78084a0305d21c.tar.xz
Merge branch 'nd/archive-attribute'
* nd/archive-attribute: archive test: attributes archive: do not read .gitattributes in working directory unpack-trees: do not muck with attributes when we are not checking out attr: add GIT_ATTR_INDEX "direction" archive tests: do not use .gitattributes in working directory
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions