summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-26 15:07:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-26 15:07:48 -0700
commit2ddc898bc0d0c3f03b4aeeb34c33f652d95f2807 (patch)
treef465d150b6bef7a8e4e9553ba5d69936ab0307e1 /t/t6060-merge-index.sh
parentMerge branch 'mm/merge-in-dirty-worktree-doc' (diff)
parentfix "builtin-*" references to be "builtin/*" (diff)
downloadtgif-2ddc898bc0d0c3f03b4aeeb34c33f652d95f2807.tar.xz
Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
* ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*"
Diffstat (limited to 't/t6060-merge-index.sh')
0 files changed, 0 insertions, 0 deletions