diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:31 -0700 |
| commit | e7e656c09ab6bb0eda6312045cb5d61448309bcb (patch) | |
| tree | f94e0a4f00c47bc60040b9f354f43a83f91848df /t | |
| parent | 77354d8cdc6e0bf407de23d762760cccee5d757c (diff) | |
| parent | aacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 (diff) | |
| download | git-e7e656c09ab6bb0eda6312045cb5d61448309bcb.tar.gz git-e7e656c09ab6bb0eda6312045cb5d61448309bcb.tar.xz | |
Merge branch 'jk/merge-tree-added-identically'
The resolution of some corner cases by "git merge-tree" were
inconsistent between top-of-the-tree and in a subdirectory.
* jk/merge-tree-added-identically:
merge-tree: don't print entries that match "local"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4300-merge-tree.sh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index d0b2a457b..bd43b3d8e 100755 --- a/t/t4300-merge-tree.sh +++ b/t/t4300-merge-tree.sh @@ -26,8 +26,6 @@ EXPECTED test_expect_success 'file add !A, B' ' cat >expected <<\EXPECTED && -added in local - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE EXPECTED git reset --hard initial && @@ -38,9 +36,6 @@ EXPECTED test_expect_success 'file add A, B (same)' ' cat >expected <<\EXPECTED && -added in both - our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE - their 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE EXPECTED git reset --hard initial && @@ -181,9 +176,6 @@ AAA" && test_expect_success 'file remove A, !B' ' cat >expected <<\EXPECTED && -removed in local - base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE - their 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE EXPECTED git reset --hard initial && @@ -283,8 +275,6 @@ test_expect_success 'turn tree to file' ' test_commit "make-file" "dir" "CCC" && git merge-tree add-tree add-another-tree make-file >actual && cat >expect <<-\EOF && - added in local - our 100644 ba629238ca89489f2b350e196ca445e09d8bb834 dir/another removed in remote base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path |