diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-02 05:39:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-02 05:39:41 (GMT) |
| commit | a6b51f11ab7f7f838a9b17f81059eebfc36e4c84 (patch) | |
| tree | ba312419331dbca9506e0559ab534bb1e6d914a8 /t | |
| parent | 10b15b86f545e081aebba8783ad9e9acf6bf0d98 (diff) | |
| download | git-a6b51f11ab7f7f838a9b17f81059eebfc36e4c84.zip git-a6b51f11ab7f7f838a9b17f81059eebfc36e4c84.tar.gz git-a6b51f11ab7f7f838a9b17f81059eebfc36e4c84.tar.bz2 | |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions