tree d94c1c5de87aeb759be0ffccbf4decfe358b27f9
parent 947ad2e1de787deda69b40c7047436c37dc040c7
author Robin Rosenberg <robin.rosenberg.lists@dewire.com> 1188648670 +0200
committer Junio C Hamano <gitster@pobox.com> 1188668216 -0700

Mention -m as an abbreviation for --merge

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>