| commit | f049e0944d32715ee8893d290d1c52888216fbe4 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sat, 12 Jul 2008 14:56:59 +0000 (12 15:56 +0100) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sun, 13 Jul 2008 21:58:40 +0000 (13 17:58 -0400) | ||
| tree | b0b23106454701c145b8073ae0d042bbe2c75de2 | treesnapshot (tar.gz zip) |
| parent | af894943cb9dbad1d6892dc983dc6ac0fa6ca8e8 | commitdiff |
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>
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>
| lib/merge.tcl | diffblobblamehistory |