diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:48:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:48:44 -0700 |
| commit | 456cb4cf3ef6e3dec637b7061b0c834b62eba0f5 (patch) | |
| tree | 193fa9cb1011cc29e72e082e1d3d83cfe65ae841 /t | |
| parent | Merge branch 'rs/maint-grep-word-regexp-fix' into maint (diff) | |
| parent | Change xdl_merge to generate output even for null merges (diff) | |
| download | tgif-456cb4cf3ef6e3dec637b7061b0c834b62eba0f5.tar.xz | |
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
* cb/maint-1.6.0-xdl-merge-fix:
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
Conflicts:
xdiff/xmerge.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6023-merge-file.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index f8942bc890..7dcf391914 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -54,6 +54,12 @@ deduxit me super semitas jusitiae, EOF printf "propter nomen suum." >> new4.txt +test_expect_success 'merge with no changes' ' + cp orig.txt test.txt && + git merge-file test.txt orig.txt orig.txt && + test_cmp test.txt orig.txt +' + cp new1.txt test.txt test_expect_success "merge without conflict" \ "git merge-file test.txt orig.txt new2.txt" |