![[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) |
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
MERGE_RR is in .git, not .git/rr-cache
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/rerere.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/rerere.c
Simple merge