diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:43 -0700 |
| commit | 7b1cb5c40ebb57c5a26f1335807be24dba8d4518 (patch) | |
| tree | 0eab5db92d6e8f63851fc4a7630d8b42186a0e99 /git-merge-one-file.sh | |
| parent | Merge branch 'rr/imap-send-unconfuse-from-line' (diff) | |
| parent | http-backend: Don't infinite loop during die() (diff) | |
| download | tgif-7b1cb5c40ebb57c5a26f1335807be24dba8d4518.tar.xz | |
Merge branch 'sp/maint-http-backend-die-triggers-die-recursively'
* sp/maint-http-backend-die-triggers-die-recursively:
http-backend: Don't infinite loop during die()
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions