summaryrefslogtreecommitdiff
path: root/t/t7004
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:02:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-08 23:02:17 -0700
commitbb11eb31a2e7da7f878dd501d39f6877ec00eb7d (patch)
tree4522f1b81040585f03b586200340e8bf7586bf46 /t/t7004
parentMerge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 (diff)
parentblame: read custom grafts given by -S before calling setup_revisions() (diff)
downloadtgif-bb11eb31a2e7da7f878dd501d39f6877ec00eb7d.tar.xz
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
* jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c
Diffstat (limited to 't/t7004')
0 files changed, 0 insertions, 0 deletions