--- a/tests/test-filebranch.out +++ b/tests/test-filebranch.out @@ -1,4 +1,5 @@ creating base +4 files updated, 0 files merged, 0 files removed, 0 files unresolved creating branch a creating branch b we shouldn't have anything but n state here