comparison tests/test-rename-merge2.out @ 6362:bc3dbdb1d430

imerge: replace "merge" with "internal:merge" when non-interactive
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:02 +0100
parents 4b0c9c674707
children 368a4ec603cc
comparison
equal deleted inserted replaced
6361:9b21faa6f013 6362:bc3dbdb1d430