Mercurial > hg
view tests/test-merge3.out @ 3751:797c6e70092b
Don't require a diff which accepts the -N option.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 22:29:47 +0100 |
parents | 91c56c427171 |
children |
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 22:29:47 +0100 |
parents | 91c56c427171 |
children |