diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-12 15:56:59 +0100 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-07-13 17:58:40 -0400 |
| commit | f049e0944d32715ee8893d290d1c52888216fbe4 (patch) | |
| tree | b0b23106454701c145b8073ae0d042bbe2c75de2 /xdiff/xmacros.h | |
| parent | git-gui: Exit shortcut in MacOSX repaired (diff) | |
| download | tgif-f049e0944d32715ee8893d290d1c52888216fbe4.tar.xz | |
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 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions