Merge branch 'fix'

* fix:
  git-commit --amend: two fixes.
This commit is contained in:
Junio C Hamano
2006-04-20 02:52:04 -07:00
2 changed files with 16 additions and 7 deletions

View File

@ -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.