From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Oct 2008 22:32:35 +0000 (-0700)
Subject: Fix mismerge at cdb22c4 in builtin-checkout.c
X-Git-Tag: v1.6.1-rc1~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/828e32b82e3e2bb10d6d730d3abe505063b481f6?ds=sidebyside;hp=828e32b82e3e2bb10d6d730d3abe505063b481f6

Fix mismerge at cdb22c4 in builtin-checkout.c

The code to complain when -b is not given but an explicit --track/--no-track
override was given from the command line was unchanged on one branch and
reworked on the other branch.  The merge result incorrectly kept it.

Spotted by Matt McCutchen.

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