| commit | 63aa1d0cb78e8fcf36ea2b8b65750d9a45d59f63 | |
| author | Johannes Sixt <johannes.sixt@telecom.at> | |
| Tue, 14 Oct 2008 11:48:37 +0000 (14 13:48 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 1 Nov 2008 23:12:29 +0000 (1 16:12 -0700) | ||
| tree | 2bc92ea7a6fec62f99401063651653f487cd9ac2 | treesnapshot (tar.gz zip) |
| parent | 8c76212529570aed70c46d6f252cb1a4010f3f2e | commitdiff |
git-gui: Do not munge conflict marker lines in a normal diff
Previously, conflict markers were highlighted in two ways: (1) They
received a distinguishing color; and (2) they had the '+' removed at the
beginning of the line. However, by doing (2), a hunk that contained
conflict markers could not be staged or unstaged because the resulting
patch was corrupted. With this change we no longer modify the diff text
of a 2-way diff, so that "Stage Hunk" and friends work.
Note that 3-way diff of a conflicted file is unaffected by this change,
and '++' before conflict markers is still removed. But this has no negative
impact because in this mode staging hunks or lines is disabled anyway.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Previously, conflict markers were highlighted in two ways: (1) They
received a distinguishing color; and (2) they had the '+' removed at the
beginning of the line. However, by doing (2), a hunk that contained
conflict markers could not be staged or unstaged because the resulting
patch was corrupted. With this change we no longer modify the diff text
of a 2-way diff, so that "Stage Hunk" and friends work.
Note that 3-way diff of a conflicted file is unaffected by this change,
and '++' before conflict markers is still removed. But this has no negative
impact because in this mode staging hunks or lines is disabled anyway.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| lib/diff.tcl | diffblobblamehistory |