git-gui: Minor refactoring of merge command line in merge support
commit84f67537b13bf0a959b1cad50b0d490071dc921a
authorShawn O. Pearce <spearce@spearce.org>
Mon, 30 Jul 2007 00:21:54 +0000 (29 20:21 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 30 Jul 2007 03:44:52 +0000 (29 23:44 -0400)
tree8b19121e813e149512428e0d510d20a29576bb55
parentdac70892638d08f50c49c539155c4cb54a9b9c28
git-gui: Minor refactoring of merge command line in merge support

This is just a small code movement to cleanup how we generate
the command line for a merge.  I'm only doing it to make the
next series of changes slightly more readable.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
lib/merge.tcl