tests/test-rebuildstate.out

record: check that we are not committing a merge before patch selection

It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.

adding bar
adding foo
% state dump after
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo