diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2020-10-10 09:22:36 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2020-10-10 09:22:36 +0800 |
| commit | b4a48be10ce4bfbca3f859642ab3fc939a9adb43 (patch) | |
| tree | b110c10635b8207cbc3898a41d451c0bc9d711ec /t/t6400-merge-df.sh | |
| parent | Merge branch 'fr_2.29.0_rnd_1' of github.com:jnavila/git (diff) | |
| parent | Git 2.29-rc1 (diff) | |
| download | tgif-b4a48be10ce4bfbca3f859642ab3fc939a9adb43.tar.xz | |
Merge tag 'v2.29.0-rc1' of github.com:git/git
Git 2.29-rc1
* tag 'v2.29.0-rc1' of github.com:git/git:
Git 2.29-rc1
doc: fix the bnf like style of some commands
doc: git-remote fix ups
doc: use linkgit macro where needed.
git-bisect-lk2009: make continuation of list indented
ci: do not skip tagged revisions in GitHub workflows
ci: skip GitHub workflow runs for already-tested commits/trees
tests: avoid using the branch name `main`
t1415: avoid using `main` as ref name
Makefile: ASCII-sort += lists
help: do not expect built-in commands to be hardlinked
index-pack: make get_base_data() comment clearer
index-pack: drop type_cas mutex
index-pack: restore "resolving deltas" progress meter
compat/mingw.h: drop extern from function declaration
GitHub workflow: automatically follow minor updates of setup-msbuild
t5534: split stdout and stderr redirection
Diffstat (limited to 't/t6400-merge-df.sh')
| -rwxr-xr-x | t/t6400-merge-df.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh index 400a4cd139..f1b84617af 100755 --- a/t/t6400-merge-df.sh +++ b/t/t6400-merge-df.sh @@ -124,7 +124,7 @@ test_expect_success 'Simple merge in repo with interesting pathnames' ' git add . && git commit -m initial && - git branch main && + git branch topic && git branch other && git checkout other && @@ -132,10 +132,10 @@ test_expect_success 'Simple merge in repo with interesting pathnames' ' git add -u && git commit -m other && - git checkout main && - echo main >foo/bar/baz && + git checkout topic && + echo topic >foo/bar/baz && git add -u && - git commit -m main && + git commit -m topic && git merge other && git ls-files -s >out && |