I just did a merge using current trunk. There were a lot of text and tree conflicts. I noticed it does not start resolving them until the end now, which is expected. However, one thing I could not do was postpone all conflicts. I used the 's' option and saw that option 'q' is supposed to do this but I still had to enter 'p' or 'q' for every conflict.
I assume this is a bug? -- Thanks Mark Phippard http://markphip.blogspot.com/
