automerge: 057b8bab * commit '057b8bab': Set the max number of allowed errs to be 3. (fix bug in fugu)