![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Jul 2010 19:08:36 +0000 (12:08 -0700) | ||
| commit | 4bd874c8f30d55b6189dacf1d769855ed2df4299 | |
| tree | b449d8155f4148e1afe5c7c9c99553bf85fcab14 | tree | snapshot |
| parent | 4cd1b99c32d9a345438d098f37e75077d072778f | commit | diff |
| parent | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 | commit | diff |
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
| builtin/rerere.c | diff1 | | diff2 | | blob | history |