Alexander Gavrilov writes: > Now that git-gui has facilities to help users resolve > conflicts, it makes sense to launch it from other GUI > tools when they happen. The resolution capabilities of git citool seem to be that it detects the conflict markers and lets you run meld on the 3 versions. Have I missed anything there? Do people find that fixing things manually in meld is sufficient, or do we really want something more powerful? Paul. -- 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
