![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:48:48 +0000 (23:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jul 2008 06:56:27 +0000 (23:56 -0700) | ||
| commit | ebcffb1d44643bab69671abdf79209489e64dbef | |
| tree | d451abfc0dad9e9f3c45eb3cdc247d1dc3f81710 | tree | snapshot |
| parent | 1864265c4d9afa374b27836ff0a3b3eb40144552 | commit | diff |
| parent | 0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 | commit | diff |
Merge branch 'js/merge-rr'
* js/merge-rr:
Move MERGE_RR from .git/rr-cache/ into .git/
Conflicts:
builtin-rerere.c
* js/merge-rr:
Move MERGE_RR from .git/rr-cache/ into .git/
Conflicts:
builtin-rerere.c
| rerere.c | diff1 | | | | blob | history |