diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:14:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:14:27 -0700 |
| commit | e24058f57f4e76e38e20390c5927590f3cd48085 (patch) | |
| tree | d8f9b7149447d6d1be6ea847b807d247d3356fd4 /xdiff/xmerge.c | |
| parent | gitweb: Don't die_error in git_tag after already printing headers (diff) | |
| parent | rerere: fix overeager gc (diff) | |
| download | tgif-e24058f57f4e76e38e20390c5927590f3cd48085.tar.xz | |
Merge branch 'sg/rerere-gc-old-still-used'
* sg/rerere-gc-old-still-used:
rerere: fix overeager gc
mingw_utime(): handle NULL times parameter
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions