Shawn O. Pearce 18a01a0da4 git-gui: Allow git-merge to use branch names in conflict markers ... Earlier when I rewrote the merge implementation for git-gui I broke it such that the conflict markers for the "theirs" side of the hunk was using a full SHA-1 ID in hex, rather than the name of the branch the user had merged. This was because I got paranoid and passed off the full SHA-1 to git-merge, instead of giving it the reference name the user saw in the merge dialog. I'd still like to resolve the SHA-1 upfront in git-gui and always use that value throughout the merge, but I can't do that until we have a full implementation of git-merge written in Tcl. Until then its more important that the conflict markers be useful to the end-user, so we need to pass off the ref name and not the SHA-1 ID. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2007-08-20 02:17:05 -04:00
..
blame.tcl
branch_checkout.tcl
branch_create.tcl
branch_delete.tcl
branch_rename.tcl
branch.tcl
browser.tcl
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
class.tcl
commit.tcl
console.tcl
database.tcl
diff.tcl
encoding.tcl
error.tcl
index.tcl
merge.tcl	git-gui: Allow git-merge to use branch names in conflict markers	2007-08-20 02:17:05 -04:00
option.tcl
remote_branch_delete.tcl
remote.tcl
shortcut.tcl
status_bar.tcl
transport.tcl