diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:26 -0700 |
| commit | 310b94528c9a66f0293b8fd7dca4386e579902de (patch) | |
| tree | bd3e4eec97b59337c84368bc22cf52f2ea35dc8a /builtin/merge-ours.c | |
| parent | Merge branch 'sb/wt-status-cleanup' into maint (diff) | |
| parent | http-push: don't check return value of lookup_unknown_object() (diff) | |
| download | tgif-310b94528c9a66f0293b8fd7dca4386e579902de.tar.xz | |
Merge branch 'rs/http-push-cleanup' into maint
Code clean-up.
* rs/http-push-cleanup:
http-push: don't check return value of lookup_unknown_object()
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions