diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-09 05:07:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-09 05:07:57 +0100 |
| commit | ad416ed433fdcf838916a84177fe9e810be19eff (patch) | |
| tree | dcba56533726b1e791b4c9ab8f44c7f8fd4a1b2e /t/t9300-fast-import.sh | |
| parent | merge-tool documentation: describe custom command usage (diff) | |
| parent | GIT 1.5.4.4 (diff) | |
| download | git-ad416ed433fdcf838916a84177fe9e810be19eff.tar.xz git-ad416ed433fdcf838916a84177fe9e810be19eff.zip | |
Merge branch 'maint' to sync with 1.5.4.4
* maint:
GIT 1.5.4.4
ident.c: reword error message when the user name cannot be determined
Fix dcommit, rebase when rewriteRoot is in use
Really make the LF after reset in fast-import optional
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index cceedbb2b7..c4f4465dc6 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -869,6 +869,8 @@ zcommits COMMIT reset refs/tags/O3-2nd from :5 +reset refs/tags/O3-3rd +from :5 INPUT_END cat >expect <<INPUT_END |