From 6668fe0ca201fb28311ca10300afc06136d38211 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Oct 2013 15:11:21 -0400 Subject: update for DiffTree type change (which fixes assistant in subdir confusion bug) --- doc/bugs/direct_mode_assistant_in_subdir_confusion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') 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]] -- cgit v1.2.3