From 4590307a338b1a4912c7a203c71af8b8995ea885 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Tue, 16 Nov 2010 10:21:52 +0100 Subject: 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 Signed-off-by: Pat Thoyts --- git-gui.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-gui.sh') 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 -- cgit v1.2.3