summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:13:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-16 04:13:04 -0700
commitb21f9e7f860620571667fba33ed511bed59dfb14 (patch)
tree1cb50257a9c0f179c88f81014064d079d5b416c8 /t/t6032-merge-large-rename.sh
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
parentmerge: indicate remote tracking branches in merge message (diff)
downloadtgif-b21f9e7f860620571667fba33ed511bed59dfb14.tar.xz
Merge branch 'jk/maint-merge-msg-fix'
* jk/maint-merge-msg-fix: merge: indicate remote tracking branches in merge message merge: fix incorrect merge message for ambiguous tag/branch add tests for merge message headings
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions