[12:03] <sabdf1> lifeless: i've switched my merging back to two-way, because the hunks are easier to work with
[12:03] <sabdf1> will this work?
[12:03] <lifeless> so the question is 'will the merge points chosen by this algorithm be suitable for two way merges' ?
[12:04] <lifeless> I think the answer is 'yes', but it is not designed for that, so when I merge this you will want to use 'merge --two-way --star-merge' to have the old behaviour.
[12:05] <sabdf1> so baz will have a single merge command?
[12:06] <lifeless> yup.
[12:06] <sabdf1> with --star-merge and --two-way as options?
[12:06] <lifeless> right. 
[12:06] <sabdf1> nice
=== daniels [~daniels@amnesiac.heapspace.net]  has joined #launchpad
=== stub [~stub@213.151.107.243]  has joined #launchpad
=== lamont_r [~lamont@213.151.107.243]  has joined #launchpad
[02:18] <lamont_r> lifeless: you around still?
[02:20] <lamont_r> nm
=== sabdf1 [~mark@213.151.107.243]  has left #launchpad [] 
=== daniels [~daniels@amnesiac.heapspace.net]  has left #launchpad [] 
=== Mithrandir [~tfheen@vawad.err.no]  has left #launchpad [] 
=== elmo [~james@213.151.107.243]  has joined #launchpad
=== stub [~stub@213.151.107.243]  has joined #launchpad
=== elmo [~james@213.151.107.243]  has joined #launchpad
=== kiko [~kiko@213.151.107.243]  has joined #launchpad
=== kiko [~kiko@213.151.107.243]  has joined #launchpad
=== carlos [~carlos@213.151.107.243]  has joined #launchpad
=== carlos [~carlos@213.151.107.243]  has joined #launchpad
=== cprov [~cprov@213.151.107.243]  has joined #launchpad
=== elmo [~james@213.151.107.243]  has joined #launchpad
=== salgado [~salgado@213.151.107.243]  has joined #launchpad
=== carlos [~carlos@213.151.107.243]  has joined #launchpad
=== carlos [~carlos@213.151.107.243]  has joined #launchpad
=== cprov [~cprov@213.151.107.243]  has joined #launchpad
=== carlos [~carlos@213.151.107.243]  has joined #launchpad
=== lamont_r [~lamont@213.151.107.243]  has joined #launchpad