![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Dec 2005 05:39:41 +0000 (21:39 -0800) | ||
| commit | a6b51f11ab7f7f838a9b17f81059eebfc36e4c84 | |
| tree | ba312419331dbca9506e0559ab534bb1e6d914a8 | tree | snapshot |
| parent | 10b15b86f545e081aebba8783ad9e9acf6bf0d98 | commit | diff |
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>
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>
| git-merge-recursive.py | diff | blob | history |