diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-20 13:52:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-20 13:52:04 +0400 |
| commit | 0080f50eb333192617739c9954a30611cc0adeaa (patch) | |
| tree | 2ef11b32d4fd117d60be87157b17651b418f4f49 /t/t1200-tutorial.sh | |
| parent | a4d0cced53facb17d777a396aa6b388e97f1d909 (diff) | |
| parent | 6a74642c500118164ec331da93ef29b1163301bc (diff) | |
Merge branch 'fix'
* fix:
git-commit --amend: two fixes.
Diffstat (limited to 't/t1200-tutorial.sh')
| -rwxr-xr-x | t/t1200-tutorial.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 16b3ea9157..c7db20e7f3 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -114,6 +114,8 @@ EOF git commit -m 'Merged "mybranch" changes.' -i hello +test_done + cat > show-branch.expect << EOF * [master] Merged "mybranch" changes. ! [mybranch] Some work. |