diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-02 12:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-02 12:02:18 -0700 |
| commit | 8afd3178437eef29a08ba21aceb47a94177409d5 (patch) | |
| tree | 533fedcb0e579f28157dd12340fe9f962b506921 /ll-merge.h | |
| parent | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint (diff) | |
| parent | git-branch: display "was sha1" on branch deletion rather than just "sha1" (diff) | |
| download | tgif-8afd3178437eef29a08ba21aceb47a94177409d5.tar.xz | |
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint
* bc/maint-1.6.1-branch-deleted-was:
git-branch: display "was sha1" on branch deletion rather than just "sha1"
Conflicts:
builtin-branch.c
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions