Merge branch 'tr/word-diff'
* tr/word-diff: diff: add --word-diff option that generalizes --color-words Conflicts: diff.c
Showing
想要评论请 注册 或 登录
* tr/word-diff: diff: add --word-diff option that generalizes --color-words Conflicts: diff.c