And there's no reason to make them adjust quickly, either.
Oh, but there is. As others have pointed out, a lot of tools rely on various git conventions. It's easy enough to create a context diff from git. That seems like a separate issue from how the merge is actually done. I don't see any reason not to use git's merge power to make life so much easier.
Copyright © 2017, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds