# 
# 
# patch "tests/t_merge_manual.at"
#  from [e0a2e404966798d72544ff7a7d227cdf38164b9b]
#    to [fe047ad7e648c30b17daefb7e7e3d5af19dc7900]
# 
============================================================
--- tests/t_merge_manual.at	e0a2e404966798d72544ff7a7d227cdf38164b9b
+++ tests/t_merge_manual.at	fe047ad7e648c30b17daefb7e7e3d5af19dc7900
@@ -237,7 +237,7 @@
 COMMIT(binbranch)
 PARENT_SHA=`BASE_REVISION`
 
-AT_CHECK(MONOTONE attr get binary.bmp manual_merge, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr get binary.bmp mtn:manual_merge, [], [ignore], [ignore])
 
 AT_CHECK(cp -f left.bmp binary.bmp)
 COMMIT(binbranch)
@@ -281,7 +281,7 @@
 AT_CHECK(cp -f right.bmp forcebin.bmp)
 
 # set bin
-AT_CHECK(MONOTONE attr set forcebin.bmp manual_merge true, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set forcebin.bmp mtn:manual_merge true, [], [ignore], [ignore])
 COMMIT(forcebinbranch)
 
 # file marked binary: merge should fail
@@ -290,7 +290,7 @@
 # --- fourth: automatically make filename as binary, then force text
 AT_CHECK(cp -f parent.bmp forcetext.bmp)
 AT_CHECK(MONOTONE --rcfile=binary.lua add forcetext.bmp, [], [ignore], [ignore])
-AT_CHECK(MONOTONE attr set forcetext.bmp manual_merge false, [], [ignore], [ignore])
+AT_CHECK(MONOTONE attr set forcetext.bmp mtn:manual_merge false, [], [ignore], [ignore])
 COMMIT(forcetextbranch)
 PARENT_SHA=`BASE_REVISION`