summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-10-14 11:48:37 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-11-01 23:12:29 (GMT)
commit63aa1d0cb78e8fcf36ea2b8b65750d9a45d59f63 (patch)
tree2bc92ea7a6fec62f99401063651653f487cd9ac2 /po
parent8c76212529570aed70c46d6f252cb1a4010f3f2e (diff)
downloadgit-63aa1d0cb78e8fcf36ea2b8b65750d9a45d59f63.zip
git-63aa1d0cb78e8fcf36ea2b8b65750d9a45d59f63.tar.gz
git-63aa1d0cb78e8fcf36ea2b8b65750d9a45d59f63.tar.bz2
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>
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions