diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:58 -0700 |
| commit | 22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch) | |
| tree | 0091b831de88064187f0ddfd637b8ff93883eded /t/t3200-branch.sh | |
| parent | Merge branch 'cj/p4merge' (diff) | |
| parent | diff-files: show unmerged entries correctly (diff) | |
| download | tgif-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.xz | |
Merge branch 'jc/fix-diff-files-unmerged'
* jc/fix-diff-files-unmerged:
diff-files: show unmerged entries correctly
diff: remove often unused parameters from diff_unmerge()
diff.c: return filepair from diff_unmerge()
test: use $_z40 from test-lib
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 0ce95c04e5..9e69c8c926 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -46,7 +46,7 @@ test_expect_success \ 'git branch a/b/c && test -f .git/refs/heads/a/b/c' cat >expect <<EOF -0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master +$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master EOF test_expect_success \ 'git branch -l d/e/f should create a branch and a log' \ @@ -232,7 +232,7 @@ test_expect_success \ # Keep this test last, as it changes the current branch cat >expect <<EOF -0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master +$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master EOF test_expect_success \ 'git checkout -b g/h/i -l should create a branch and a log' \ |