git-commit-vandalism/lib
Shawn O. Pearce 84f67537b1 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>
2007-07-29 23:44:52 -04:00
..
blame.tcl git-gui: Don't show blame tooltips that we have no data for 2007-07-19 01:45:42 -04:00
branch_checkout.tcl git-gui: Allow double-click in checkout dialog to start checkout 2007-07-08 22:34:53 -04:00
branch_create.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch_delete.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch_rename.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00
branch.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
browser.tcl git-gui: Use more modern looking icons in the tree browser 2007-07-29 23:44:52 -04:00
checkout_op.tcl git-gui: Unify wording to say "to stage" instead of "to add" 2007-07-29 03:09:07 -04:00
choose_rev.tcl git-gui: Make sure remotes are loaded when picking revisions 2007-07-29 23:44:51 -04:00
class.tcl git-gui: Teach class system to support [$this cmd] syntax 2007-07-08 21:12:45 -04:00
commit.tcl git-gui: Unify wording to say "to stage" instead of "to add" 2007-07-29 03:09:07 -04:00
console.tcl Merge branch 'maint' 2007-07-09 21:19:13 -04:00
database.tcl git-gui: Delay the GC hint until after we are running 2007-07-17 23:20:56 -04:00
diff.tcl git-gui: Always disable the Tcl EOF character when reading 2007-07-17 01:50:10 -04:00
encoding.tcl git-gui: Translate standard encoding names to Tcl ones 2007-07-19 01:27:17 -04:00
error.tcl git-gui: Don't crash in ask_popup if we haven't mapped main window yet 2007-07-17 22:45:53 -04:00
index.tcl git-gui: Unify wording to say "to stage" instead of "to add" 2007-07-29 03:09:07 -04:00
merge.tcl git-gui: Minor refactoring of merge command line in merge support 2007-07-29 23:44:52 -04:00
option.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
remote_branch_delete.tcl git-gui: Always use absolute path to all git executables 2007-07-09 01:17:09 -04:00
remote.tcl git-gui: Save remote urls obtained from config/remotes setup 2007-07-25 04:23:09 -04:00
shortcut.tcl git-gui: Include a space in Cygwin shortcut command lines 2007-07-09 21:19:22 -04:00
status_bar.tcl git-gui: Show a progress meter for checking out files 2007-07-08 22:48:19 -04:00
transport.tcl git-gui: Refactor branch switch to support detached head 2007-07-08 22:34:46 -04:00