update for DiffTree type change (which fixes assistant in subdir confusion bug)
This commit is contained in:
parent
c7b8c776a8
commit
19816bca41
4 changed files with 16 additions and 9 deletions
|
@ -32,3 +32,6 @@ tree, which its code actually assumes is the case.
|
|||
|
||||
The assistant, however, does not do that, and it's useful in general to
|
||||
only run it in a subdir.
|
||||
|
||||
> Made sync merge code handle this correctly. Conflicted merge handing code
|
||||
> was already ok. [[fixed|done]] --[[Joey]]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue