t/README: hint about using $(pwd) rather than $PWD in tests

diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh
index 2293797553d49c5221da10ca17f97eeba1f5d29d..de9ff89d14ff97f1691efee3a670084d4f20a249 100755 (executable)
--- a/t/t3032-merge-recursive-options.sh
+++ b/t/t3032-merge-recursive-options.sh
@@ -16,13 +16,13 @@ test_description='merge-recursive options
 test_expect_success 'setup' '
        conflict_hunks () {
                sed -n -e "
-                       /^<<<</ b inconflict
+                       /^<<<</ b conflict
                        b
-                       : inconflict
+                       : conflict
                        p
                        /^>>>>/ b
                        n
-                       b inconflict
+                       b conflict
                " "$@"
        } &&