comparison tests/test-merge4.out @ 10883:196908117c27 stable

patch: don't look for headers in diff lines If you have a diff line that matches a header line, the patch splitter currently breaks your patch at this line. For example a line like: +key: value This can lead to "malformed patch" exceptions. Now fixed.
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
date Fri, 09 Apr 2010 20:34:05 +0200
parents 4b0c9c674707
children
comparison
equal deleted inserted replaced
10878:c63a6ddbbf9a 10883:196908117c27