From: Pavel Roskin <proski@gnu.org>
Date: Tue, 20 Mar 2007 17:04:29 GMT
Subject: [PATCH 2/2] cogito: understand permissions written as "100755"
Message-ID: <20070320170428.9139.69748.stgit@dv.roinet.com>
In-Reply-To: <20070320170423.9139.43914.stgit@dv.roinet.com>

The original code only recognized "755", which is not working anymore. 
This fixes t9204-merge-weird-conflicts.sh

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 cg-Xmergefile |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cg-Xmergefile b/cg-Xmergefile
index ac9d356..1219d1f 100755
--- a/cg-Xmergefile
+++ b/cg-Xmergefile
@@ -53,11 +53,12 @@ warning()
 # PlusMinus+XModeChar ;-)
 pmxmc()
 {
-	if [ "$1" = "755" ]; then
-		_pmxmc=+
-	else
-		_pmxmc=-
-	fi
+	case "$1" in
+	*755)
+		_pmxmc=+;;
+	*)
+		_pmxmc=-;;
+	esac
 }
 
 # Set ways[] to the symbolic names of the particular ways