Junio C Hamano a6b51f11ab 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>

2005-12-01 21:39:41 -08:00

29 KiB

Executable File

Raw Blame History

View Raw