Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > Till now 'git merge -s foobar' bailed out with an error message, but > foobar in pull.twohead or pull.octopus was just silently ignored. It's > better to inform the user then just silently doing nothing. > > Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> Doesn't this make "git merge -s 'recursive resolve'" to misbehave? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
