tests/test-pull-http.out

merge: simplify flag merging code slightly

adding a
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% expect error, cloning not allowed
abort: authorization failed
requesting all changes
% serve errors
% expect error, pulling not allowed
abort: authorization failed
pulling from http://localhost/
searching for changes
% serve errors