Revision 18a01a0da428c9e1034247e2b40c62e506b73580 authored by Shawn O. Pearce on 20 August 2007, 06:17:05 UTC, committed by Shawn O. Pearce on 20 August 2007, 06:17:05 UTC
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>
1 parent c6951dd
| File | Mode | Size |
|---|---|---|
| blame.tcl | -rw-r--r-- | 25.3 KB |
| branch.tcl | -rw-r--r-- | 839 bytes |
| branch_checkout.tcl | -rw-r--r-- | 2.0 KB |
| branch_create.tcl | -rw-r--r-- | 4.9 KB |
| branch_delete.tcl | -rw-r--r-- | 3.3 KB |
| branch_rename.tcl | -rw-r--r-- | 2.8 KB |
| browser.tcl | -rw-r--r-- | 11.7 KB |
| checkout_op.tcl | -rw-r--r-- | 12.8 KB |
| choose_rev.tcl | -rw-r--r-- | 14.4 KB |
| class.tcl | -rw-r--r-- | 4.3 KB |
| commit.tcl | -rw-r--r-- | 9.7 KB |
| console.tcl | -rw-r--r-- | 4.2 KB |
| database.tcl | -rw-r--r-- | 3.0 KB |
| diff.tcl | -rw-r--r-- | 7.6 KB |
| encoding.tcl | -rw-r--r-- | 11.5 KB |
| error.tcl | -rw-r--r-- | 2.1 KB |
| index.tcl | -rw-r--r-- | 7.9 KB |
| merge.tcl | -rw-r--r-- | 5.9 KB |
| option.tcl | -rw-r--r-- | 8.4 KB |
| remote.tcl | -rw-r--r-- | 4.5 KB |
| remote_branch_delete.tcl | -rw-r--r-- | 7.7 KB |
| shortcut.tcl | -rw-r--r-- | 3.7 KB |
| status_bar.tcl | -rw-r--r-- | 1.8 KB |
| transport.tcl | -rw-r--r-- | 4.3 KB |
Computing file changes ...
