Erik Faye-Lund <kusmabite@xxxxxxxxx> writes: > I'm running git version 1.7.9.msysgit.0.390.g01fca.dirty, and I've > noticed a puzzling behavior with "git add -p" on a conflicted file: it > seems to simply spew the diff and exit the process. Yeah, when I wrote the 'p'atch mode in "add--interactive", I wasn't interested at all in letting it be used on a conflicted path, so that is not a designed-in behaviour but merely whatever it happens to do. So at least it should not allow the user to pick a path that has conflicts in it. What the behaviour for people who *do* want to use the patch mode for conflicted paths should be is a separate matter. As I said, I am not interested in it, so I wouldn't be the best person to design it. I mildly suspect nobody would come up with a sane behaviour, but what would I know... -- 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