[PATCH] blame tests - add test for blame output after merge

Hi All,
 This is my first attempt at modifying a test script so it almost
certainly needs a fix or two. I have very little experience with
python so please review for style too.

 It does however introduce a test of the output of blame after a
merge, which is currently missing from the test suite.

log message
[[[
Add new test to check the output from blame after a merge
  with and without the -g option

* subversion/tests/cmdline/blame_tests.py
 (blame_output_after_merge): New
]]]

To get the trunk to pass this test, this patch is required.
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessa
geId=1875446

This test also works on the 1.6.x branch, however the patch to get
it to pass is slightly different due to intervening changes.

Alan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2140924