diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
| commit | edf9d719d1d05c1eb4f652782febfdfede212648 (patch) | |
| tree | 86e37bca053a0c5c3c99eb1124d97a9ffdb43e05 /builtin/merge.c | |
| parent | c41dd2fd7d3a16e6f0b1629d688bee3240db496c (diff) | |
| parent | 6368d9f1af7a5d4c8af2f11ffdb6af577f1e98f5 (diff) | |
| download | git-edf9d719d1d05c1eb4f652782febfdfede212648.tar.gz git-edf9d719d1d05c1eb4f652782febfdfede212648.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Always call parse_date with timezone parameter
bisect: explain the rationale behind 125
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions