tests/test-merge-remove.out

minirst: support containers

Text can be grouped into generic containers in reStructuredText:

  .. container:: foo

     This is text inside a "foo" container.

     .. container:: bar

        This is nested inside two containers.

The minirst parser now recognizes these containers. The containers are
either pruned completely from the output (included all nested blocks)
or they are simply un-indented. So if 'foo' and 'bar' containers are
kept, the above example will result in:

     This is text inside a "foo" container.

     This is nested inside two containers.

If only 'foo' containers are kept, we get:

     This is text inside a "foo" container.

No output is made if only 'bar' containers are kept.

This feature will come in handy for implementing different levels of
help output (e.g., verbose and debug level help texts).

created new head
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r   0         -2 bar
r   0         -1 foo1
copy: foo -> foo1
R bar
R foo1
% readding foo1 and bar
adding bar
adding foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo
% reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo