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)
* ns/am-abort:
  git am --abort

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge