annotate tests/test-simplemerge-cmd.out @ 5206:0f6a1bdf89fb

match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.
author Matt Mackall <mpm@selenic.com>
date Sun, 19 Aug 2007 14:03:56 -0500
parents ea7b982b6c08
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5115
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4360
diff changeset
1 (binary:application/octet-stream)