From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Apr 2015 20:46:44 +0000 (-0700)
Subject: merge: clarify "pulling into void" special case
X-Git-Tag: v2.5.0-rc0~107^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1faac1cedca475a364c72b063c79da08caee0fe9?ds=inline;hp=1faac1cedca475a364c72b063c79da08caee0fe9

merge: clarify "pulling into void" special case

Instead of having it as one of the three if/elseif/.. case arms,
test the condition and handle this special case upfront.  This makes
it easier to follow the flow of logic.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---