comparison tests/test-keyword @ 7527:5a14a8f3b909

resolve: require -a switch to resolve all files

Like revert -a, this should make this command slightly safer

7526:b7d4db95e95a

hg commit -m 8bar
hg merge
echo % keyword stays outside conflict zone
cat m
echo % resolve to local
HGMERGE=internal:local hg resolve
hg commit -m localresolve
cat m

echo % switch off expansion
echo % kwshrink with unknown file u

7527:5a14a8f3b909

hg commit -m 8bar
hg merge
echo % keyword stays outside conflict zone
cat m
echo % resolve to local
HGMERGE=internal:local hg resolve -a
hg commit -m localresolve
cat m

echo % switch off expansion
echo % kwshrink with unknown file u