diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-23 21:51:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 21:51:38 -0800 |
| commit | 5dc1308562ab5991ecada68b06707709bea408c9 (patch) | |
| tree | 321b8d7310c01d8b01584377d9aba448952a7384 /git-merge-resolve.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | bash completions: Add the --patience option (diff) | |
| download | tgif-5dc1308562ab5991ecada68b06707709bea408c9.tar.xz | |
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
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions