diff options
| author |  Jay Soffian <jaysoffian@gmail.com> | 2010-07-14 13:18:11 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-14 13:04:25 -0700 |
| commit | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (patch) | |
| tree | 5a6087ccd95cf00c8e23e8b325964ef78ca2046d /t/t2001-checkout-cache-clash.sh | |
| parent | git fetch documentation: describe short '-p' synonym to '--prune' option (diff) | |
| download | tgif-3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3.tar.xz | |
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>
Diffstat (limited to 't/t2001-checkout-cache-clash.sh')
0 files changed, 0 insertions, 0 deletions