tree 8b19121e813e149512428e0d510d20a29576bb55
parent dac70892638d08f50c49c539155c4cb54a9b9c28
author Shawn O. Pearce <spearce@spearce.org> 1185754914 -0400
committer Shawn O. Pearce <spearce@spearce.org> 1185767092 -0400

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>