summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-12 14:56:59 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-07-13 21:58:40 (GMT)
commitf049e0944d32715ee8893d290d1c52888216fbe4 (patch)
treeb0b23106454701c145b8073ae0d042bbe2c75de2 /git-gui/lib/merge.tcl
parentaf894943cb9dbad1d6892dc983dc6ac0fa6ca8e8 (diff)
downloadgit-f049e0944d32715ee8893d290d1c52888216fbe4.zip
git-f049e0944d32715ee8893d290d1c52888216fbe4.tar.gz
git-f049e0944d32715ee8893d290d1c52888216fbe4.tar.bz2
git-gui: MERGE_RR lives in .git/ directly with newer Git versions
Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete it somewhere else. Just in case somebody wants to use a newer git-gui with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if it exists). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions