mirror of
https://github.com/git/git.git
synced 2025-12-23 12:14:22 +01:00
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>
14 KiB
Executable File
14 KiB
Executable File