diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:11:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:05 -0700 |
| commit | c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3 (patch) | |
| tree | 336f75668bffdb70e92dcdb0cbf5b4769260ef6f /trace.c | |
| parent | 2a70fa4f1e377bc68bcabdc1a550e9970acccda7 (diff) | |
| download | git-c2c9a87d4f5a643ef93db7c39fc01c4965bf67a3.tar.gz | |
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>
Diffstat (limited to 'trace.c')
0 files changed, 0 insertions, 0 deletions