diff tests/test-mq-merge.out @ 10559:b1339234080e stable

resolve: rewrite help to be clearer and more complete (issue2030).
author Greg Ward <greg-hg@gerg.ca>
date Mon, 01 Mar 2010 15:41:21 -0500
parents 8cb81d75730c
children c52057614c72
line wrap: on
line diff