mirror of
https://github.com/git/git.git
synced 2024-11-20 17:25:26 +01:00
63aa1d0cb7
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> |
||
|---|---|---|
| .. | ||
| about.tcl | ||
| blame.tcl | ||
| branch_checkout.tcl | ||
| branch_create.tcl | ||
| branch_delete.tcl | ||
| branch_rename.tcl | ||
| branch.tcl | ||
| browser.tcl | ||
| checkout_op.tcl | ||
| choose_font.tcl | ||
| choose_repository.tcl | ||
| choose_rev.tcl | ||
| class.tcl | ||
| commit.tcl | ||
| console.tcl | ||
| database.tcl | ||
| date.tcl | ||
| diff.tcl | ||
| encoding.tcl | ||
| error.tcl | ||
| git-gui.ico | ||
| index.tcl | ||
| logo.tcl | ||
| merge.tcl | ||
| mergetool.tcl | ||
| option.tcl | ||
| remote_add.tcl | ||
| remote_branch_delete.tcl | ||
| remote.tcl | ||
| search.tcl | ||
| shortcut.tcl | ||
| spellcheck.tcl | ||
| sshkey.tcl | ||
| status_bar.tcl | ||
| transport.tcl | ||
| win32_shortcut.js | ||
| win32.tcl | ||