Hi,
I did a bit more syncing between what is now in devbr6 for r.watershed1
and 2.
a minimized diff for review can be found here:
https://trac.osgeo.org/grass/attachment/ticket/344/r.w2.diff
after review, that patch should be applied to r.watershed/ in devbr6 and
trunk, and r.watershed2/ removed from devbr6.
Hamish