path: root/git-gui/lib/merge.tcl
diff options
authorJohannes Schindelin <>2008-07-12 14:56:19 (GMT)
committerJunio C Hamano <>2008-07-13 08:03:10 (GMT)
commit0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 (patch)
tree1d268eea677a25ac3eb8a7192f4871653ebfcbc7 /git-gui/lib/merge.tcl
parent99d698f1e703754422f1dd780487ddbff3726dc3 (diff)
Move MERGE_RR from .git/rr-cache/ into .git/
If you want to reuse the rerere cache in another repository, and set a symbolic link to it, you do not want to have the two repositories interfer with each other by accessing the _same_ MERGE_RR. For example, if you use contrib/git-new-workdir to set up a second working directory, and you have a conflict in one working directory, but commit in the other working directory first, the wrong "resolution" will be recorded. The easy solution is to move MERGE_RR out of the rr-cache/ directory, which also corresponds with the notion that rr-cache/ contains cached resolutions, not some intermediate temporary states. Noticed by Kalle Olavi Niemitalo. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions