diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:55 -0800 |
| commit | bacec4784598ca35b9be7635cbb630ef59367b6b (patch) | |
| tree | f49872824d9b9ea390b4a8c48ace6ffaaa8555be /t/t7607-merge-overwrite.sh | |
| parent | f338cb83a0328b9fe4ec37dff0d4dcc3b8f3cde9 (diff) | |
| download | git-bacec4784598ca35b9be7635cbb630ef59367b6b.tar.gz | |
i18n: git-merge basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 5f731a1177..0a9b90b33f 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -150,8 +150,14 @@ test_expect_success 'will not overwrite untracked file on unborn branch' ' git rm -fr . && git checkout --orphan new && cp important c0.c && - test_must_fail git merge c0 2>out && - test_cmp out expect && + test_must_fail git merge c0 2>out +' + +test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' ' + test_cmp out expect +' + +test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' ' test_path_is_missing .git/MERGE_HEAD && test_cmp important c0.c ' |