view tests/test-simplemerge-cmd.out @ 4940:71fed370b7a7

Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:36:51 +0200
parents d5c3a70f8422
children ea7b982b6c08
line wrap: on
line source

(binary:application/octet-stream)