Mergiraf: syntax-aware merging for Git
LWN.net News from the source ContentWeekly EditionArchivesSearchKernelSecurityEvents calendarUnread commentsLWN FAQWrite for us EditionReturn to the Front page User: Password: |…
merging