Kyle Leber wrote on Mon, Oct 03, 2011 at 08:16:53 -0400: > On Mon, Oct 3, 2011 at 4:10 AM, Johan Corveleyn <jcor...@gmail.com> wrote: > > (2) If the "base" of the merge target doesn't have a mime-type, look > > if it has one on the "actual" node (the uncommitted local > > modifications). If that's binary, then we'll go binary. > > > > (3) Else: text merge
I stand corrected.
