From 3f2fb173ace1afa7040d31cd3239c6a9cac49006 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Fri, 19 Nov 2010 22:22:20 +0000
Subject: [PATCH] git-gui: sort the numeric ansi codes

This ensures that underline does not conflict with inverse colors.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 lib/diff.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 39e4d909b8..f5ed5d1dc6 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -502,7 +502,7 @@ proc read_diff {fd conflict_size cont_info} {
 
 		foreach {posbegin colbegin posend colend} $markup {
 			set prefix clr
-			foreach style [split $colbegin ";"] {
+			foreach style [lsort -integer [split $colbegin ";"]] {
 				if {$style eq "7"} {append prefix i; continue}
 				if {$style != 4 && ($style < 30 || $style > 47)} {continue}
 				set a "$mark linestart + $posbegin chars"
-- 
2.11.4.GIT