diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-11-16 10:21:52 +0100 |
|---|---|---|
| committer |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-11-19 11:25:00 +0000 |
| commit | 4590307a338b1a4912c7a203c71af8b8995ea885 (patch) | |
| tree | 2a5aee860cc1e5776a2ef78b35f9117fad67aef9 /git-gui.sh | |
| parent | git-gui: fix ANSI-color parsing (diff) | |
| download | tgif-4590307a338b1a4912c7a203c71af8b8995ea885.tar.xz | |
git-gui: respect conflict marker size
Respect the conflict-marker-size attribute on paths when detecting merge
conflicts.
[PT: fixed problem with variable substitution in the regexps]
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-gui.sh b/git-gui.sh index d3acf0d213..38362fa940 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3351,13 +3351,13 @@ $ui_diff tag conf d_s- \ -foreground red \ -background ivory1 -$ui_diff tag conf d<<<<<<< \ +$ui_diff tag conf d< \ -foreground orange \ -font font_diffbold -$ui_diff tag conf d======= \ +$ui_diff tag conf d= \ -foreground orange \ -font font_diffbold -$ui_diff tag conf d>>>>>>> \ +$ui_diff tag conf d> \ -foreground orange \ -font font_diffbold |