summaryrefslogtreecommitdiff
path: root/t/t8004-blame-with-conflicts.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-08 16:35:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-08 16:35:53 -0800
commit916034b93ce45bdedfb1c5cef270e6eba2a26fea (patch)
treebb334bc156def237fa6e66f56009611aa095d450 /t/t8004-blame-with-conflicts.sh
parentMerge branch 'jm/maint-gitweb-filter-forks-fix' into maint (diff)
parentbranch -m/-M: remove undocumented RENAMED-REF (diff)
downloadtgif-916034b93ce45bdedfb1c5cef270e6eba2a26fea.tar.xz
Merge branch 'jc/maint-remove-renamed-ref' into maint
* jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions