Richard Hartmann <richih.mailinglist@xxxxxxxxx> writes: > As long as there are no lines that start with the same file name, this > file format would allow for efficient merging _if_ git has an internal > concept of line identifiers. You can write a custom low-level merge driver, and use the attribute system to mark that your file is meant to be handled by that ll-merge driver. There is no need for Git to have "an internal concept of line identifiers". It may be of interest to run "git help attributes" and read up on "Defining a custom merge driver" section. -- 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