diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-07-18 16:57:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-18 16:57:47 -0700 |
| commit | 58b1ef2f0fce75ebf4fbf88e5bdf76a0afaeacce (patch) | |
| tree | d88020de86478eeaa883f6626ba6a2f5fdd94e95 /t/t4131-apply-fake-ancestor.sh | |
| parent | Revert "mailinfo: Remove only one set of square brackets" (diff) | |
| parent | checkout -f: deal with a D/F conflict entry correctly (diff) | |
| download | tgif-58b1ef2f0fce75ebf4fbf88e5bdf76a0afaeacce.tar.xz | |
Merge branch 'maint'
* maint:
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
Diffstat (limited to 't/t4131-apply-fake-ancestor.sh')
0 files changed, 0 insertions, 0 deletions