Merge branch 'js/patience-diff'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800)
* js/patience-diff:
bash completions: Add the --patience option
Introduce the diff option '--patience'
Implement the patience diff algorithm

Conflicts:
contrib/completion/git-completion.bash

No differences found