| commit | f049e0944d32715ee8893d290d1c52888216fbe4 | [log] [tgz] |
|---|---|---|
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | Sat Jul 12 15:56:59 2008 +0100 |
| committer | Shawn O. Pearce <spearce@spearce.org> | Sun Jul 13 17:58:40 2008 -0400 |
| tree | b0b23106454701c145b8073ae0d042bbe2c75de2 | |
| parent | af894943cb9dbad1d6892dc983dc6ac0fa6ca8e8 [diff] |
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>