git-gui: MERGE_RR lives in .git/ directly with newer Git versions
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 12 Jul 2008 14:56:59 +0000 (15:56 +0100)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 13 Jul 2008 21:58:40 +0000 (17:58 -0400)
commitf049e09...4d32715ee8893d290d1c52888216fbe4
treeb0b2310...454701c145b8073ae0d042bbe2c75de2copy hash to clipboard (tree)
parentaf89494...cb9dbad1d6892dc983dc6ac0fa6ca8e8copy hash to clipboard (diff)
lib/merge.tcl