From: Junio C Hamano <junkio@cox.net>
Date: Fri, 2 Dec 2005 05:39:41 +0000 (-0800)
Subject: merge-recursive: adjust git-ls-tree use for the latest.
X-Git-Tag: v0.99.9l^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6b51f11ab7f7f838a9b17f81059eebfc36e4c84?ds=sidebyside;hp=a6b51f11ab7f7f838a9b17f81059eebfc36e4c84

merge-recursive: adjust git-ls-tree use for the latest.

You need to pass -t flag if you want to see tree objects in
"git-ls-tree -r" output these days.  This change broke the tree
structure reading code in git-merge-recursive used to detect D/F
conflicts.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---