diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-17 15:11:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-17 15:11:21 -0400 |
| commit | 6668fe0ca201fb28311ca10300afc06136d38211 (patch) | |
| tree | 76b01abe2e4227f0c2ad29f71b665cfe0194c1e6 /doc | |
| parent | bf1d81bd3ec7b4128d13ca04d2a90c8165d5ee2f (diff) | |
update for DiffTree type change (which fixes assistant in subdir confusion bug)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn b/doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn index 6fe690a06..a705e434f 100644 --- a/doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn +++ b/doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn @@ -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]] |