From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Aug 2010 07:11:30 +0000 (-0500)
Subject: merge script: notice @{-1} shorthand
X-Git-Tag: v1.7.3-rc0~16^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3?ds=inline;hp=c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3

merge script: notice @{-1} shorthand

Port v1.6.2-rc1~10^2 (Teach @{-1} to git merge, 2009-02-13) to
the old merge script.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---