diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:02:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 23:02:17 -0700 |
| commit | bb11eb31a2e7da7f878dd501d39f6877ec00eb7d (patch) | |
| tree | 4522f1b81040585f03b586200340e8bf7586bf46 /xdiff | |
| parent | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 (diff) | |
| parent | blame: read custom grafts given by -S before calling setup_revisions() (diff) | |
| download | tgif-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 'xdiff')
0 files changed, 0 insertions, 0 deletions