Mercurial > hg
diff tests/test-merge2 @ 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 | 9dcf9d45cab8 |
children |
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Mar 2008 20:37:02 +0100 |
parents | 9dcf9d45cab8 |
children |