The original code only recognized "755", which is not working anymore.
This fixes t9204-merge-weird-conflicts.sh
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html