merge-recursive: adjust git-ls-tree use for the latest.
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800)
commita6b51f1...ab7f7f838a9b17f81059eebfc36e4c84
treeba31241...331dbca9506e0559ab534bb1e6d914a8copy hash to clipboard (tree)
parent10b15b8...f545e081aebba8783ad9e9acf6bf0d98copy hash to clipboard (diff)
git-merge-recursive.py