diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 14:21:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 14:21:41 -0800 |
| commit | 259b5e6d33800762142e1fadefbbcf1150e6ccc5 (patch) | |
| tree | 03341b430fa2c5b5755cbf9feb635d3aacfd6751 /builtin/merge.c | |
| parent | aa826b651ae3012d1039453b36ed6f1eab939ef9 (diff) | |
| parent | 684fea37948d720cc69b3553b42353b4b42709dc (diff) | |
Sync with maint
* maint:
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions