| commit | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 | |
| author | Jay Soffian <jaysoffian@gmail.com> | |
| Wed, 14 Jul 2010 17:18:11 +0000 (14 13:18 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Jul 2010 20:04:25 +0000 (14 13:04 -0700) | ||
| tree | 5a6087ccd95cf00c8e23e8b325964ef78ca2046d | treesnapshot (tar.gz zip) |
| parent | 1b79d1c2a8a90419238f7213870ab1dc465082fe | commitdiff |
MERGE_RR is in .git, not .git/rr-cache
0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
location of MERGE_RR but I found a few references to the old
location.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
location of MERGE_RR but I found a few references to the old
location.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/rerere.c | diffblobblamehistory | |
| t/t4151-am-abort.sh | diffblobblamehistory |