comparison tests/test-merge-local.out @ 6280:9db24a36d182

patch: check filename is /dev/null for creation or deletion (issue 1033) Otherwise, file creation or deletion is ambiguous with file being filled or emptied.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 16 Mar 2008 00:35:12 +0100
parents 5af5f0f9d724
children 92ccccb55ba3
comparison
equal deleted inserted replaced
6279:c50ac875ffcb 6280:9db24a36d182