bos@611: <!-- BEGIN tour.merge.commit -->
bos@564: <screen><prompt>$</prompt> <userinput>hg commit -m 'Merged changes'</userinput>
bos@564: </screen>
bos@611: <!-- END tour.merge.commit -->