Andreas Gruenbacher <agruen@xxxxxxx> writes: > Hello, > > is the format that git normally uses for indicating merge conflicts in files > (the <<< === >>> markers) documented somewhere? How exactly does it differ > from the diff3 format (<<< ||| === >>>)? Diff3's -m mode seems to come close > to what git does, except that git doesn't produce the ||| section: It is rcmerge / merge from RCS / CVS output format (and I think it is also format used for other VCS), and IIRC it is equivalent to "diff3 -E" format > Does git ever output a ||| section? You can ask for it with merge.conflictstyle configuration variable, or --conflict=<style> option to git-checkout. -- Jakub Narebski Poland ShadeHawk on #git -- 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
