am -3: support 3way merge on unborn branch

diff --git a/t/test-lib.sh b/t/test-lib.sh
index cf19339ccebd0ee5f55822ebe11386101f358f41..79e8a33d043e7208c2c1a08ab38fad207049ef4c 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -169,7 +169,11 @@ _z40=0000000000000000000000000000000000000000
 LF='
 '
 
-export _x05 _x40 _z40 LF
+# UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores
+# when case-folding filenames
+u200c=$(printf '\342\200\214')
+
+export _x05 _x40 _z40 LF u200c
 
 # Each test should start with something like this, after copyright notices:
 #