On 24 Jul 2007, David Kastrup spake thusly: > But merging will become nicer if the permissions actually stay > associated with the file rather than the file name. Even in things > like /etc backups, blobs not infrequently relocate from one place to > another when the system gets updated. Even without that we'd need to merge without context, i.e. with totally independent lines, for such a file. So it's not the standard git file merge. - 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
