Re:The Tyranny of the Diff
by michaelfeathers on Monday April 09, 2012 @01:37PM
(#3818136)
I just want diffs at method scope. Show me the methods that have been added, changed, or deleted. Use line diffs for things external to methods.
git diff can use --word-diff(=color) and --word-diff-regex=...
There is also the venerable "wdiff" program.
I've only found one program that can do "word patches" though: "wiggle" http://freecode.com/projects/wiggle . It works well, though I've found the interface to be slightly confusing. But turning it into a git diff and merge driver isn't that hard.