diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 19:08:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 19:08:36 (GMT) |
| commit | 4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch) | |
| tree | b449d8155f4148e1afe5c7c9c99553bf85fcab14 /builtin/merge-tree.c | |
| parent | 4cd1b99c32d9a345438d098f37e75077d072778f (diff) | |
| parent | 3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3 (diff) | |
| download | git-4bd874c8f30d55b6189dacf1d769855ed2df4299.zip git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.gz git-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.bz2 | |
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions