Here's the 2nd round of refactoring. This is based on Junio's pu branch. I'm including the difftool.prompt patch in this series because it is a dependency and including it here makes that obvious. I tried to keep the dependencies untangled while still being able to manage the various command-line flags all in one place. Alas, this is shell so it can only be so elegant. I went ahead and rolled in the "remove -o $MERGED" from tkdiff for the diff mode case. Still TODO: incorporate the "add diffuse as a merge tool" patch. Is there more that can be refactored? Probably the part that sets up candidate mergetools, replacing that with a function might be useful. Here's what I've got so far. -- 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
