Merge branch 'ns/am-abort'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:13 +0000 (18:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jul 2008 01:00:13 +0000 (18:00 -0700)
commit245648dede5e67180ce059a71e3f77a8bb7f52b4
tree91d0038cb057d3e05e5d6094009d8a420163d4db
parent378335b37cd711a44bd4c85d3643db36a7f1ac67
parent3e5057a8b4499f7b000cd465a3adf6ef22b89f2a
Merge branch 'ns/am-abort'

* ns/am-abort:
  git am --abort
git-am.sh