diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 02:17:28 -0700 |
| commit | 86d72443215612f66f77dfc57ec9613c8153617c (patch) | |
| tree | 82923deca0de6a8ae263ba84e7f239e881db8388 /combine-diff.c | |
| parent | 17d778e710f9dacc770b5790e792b85cdba75a9d (diff) | |
| parent | 121c813f8d6054dbee25c03301599c0f8d645d7f (diff) | |
| download | git-86d72443215612f66f77dfc57ec9613c8153617c.tar.gz | |
Merge branch 'jc/rerere'
* jc/rerere:
rerere.autoupdate
t4200: fix rerere test
rerere: remove dubious "tail_optimization"
git-rerere: detect unparsable conflicts
rerere: rerere_created_at() and has_resolution() abstraction
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions