current head (141). But merge --preview claims it's going to be merged. And if I look at the patch in 136 (diff -c136), I can see that it has already been incorporated into the code at 141. This smells wrong to me. Am I missing something, or is merge --preview broken? Greg