![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 24 Jan 2009 05:51:38 +0000 (21:51 -0800) | ||
| commit | 5dc1308562ab5991ecada68b06707709bea408c9 | |
| tree | 321b8d7310c01d8b01584377d9aba448952a7384 | tree | snapshot |
| parent | f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d | commit | diff |
| parent | cc545709253fe8440db2648cb5c771e5b126bdb5 | commit | diff |
Merge branch 'js/patience-diff'
* 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
* 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
| Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| xdiff/xdiff.h | diff1 | | diff2 | | blob | history |