diff tests/test-double-merge.out @ 8026:683d8ebcf434

expand "dir" to "directory" in help texts
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Apr 2009 22:47:56 +0200
parents 368a4ec603cc
children 50b6af595e0c
line wrap: on
line diff