Tool for applying patches that patch cannot apply because of conflicting changes
https://neil.brown.name/wiggle