diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:36 -0700 |
| commit | 4bd874c8f30d55b6189dacf1d769855ed2df4299 (patch) | |
| tree | b449d8155f4148e1afe5c7c9c99553bf85fcab14 /builtin/merge-ours.c | |
| parent | Merge branch 'jc/diff-merge-base-multi' (diff) | |
| parent | MERGE_RR is in .git, not .git/rr-cache (diff) | |
| download | tgif-4bd874c8f30d55b6189dacf1d769855ed2df4299.tar.xz | |
Merge branch 'js/merge-rr-fix'
* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions