Followup to r18716: Add an extra test to validate that svn merge ignores  whitespace when requested (-x -w option).  Updated copyright date to 2006.
Followup to r18716: Add an extra test to validate that svn merge ignores 
whitespace when requested (-x -w option). 
Updated copyright date to 2006.

* subversion/tests/cmdline/merge_tests.py
  (merge_ignore_whitespace): New test
  (test_list): Run the new merge test.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion