Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > I've updated the commit messages, option handling and tests as > suggested by dscho. I've also changed the tests that used > '--strategy=resolve' to use a real external merge strategy so they > continue to test the same code path once Alban's patches to handle the > resolve strategy without forking are merged Thanks, will take a look and replace.
