diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 10:59:51 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 10:59:51 -0700 |
| commit | 92d2afd563afca4d6b4c20c7e2e859bc7219a3b1 (patch) | |
| tree | 32ba979a8b05d24557b633addc467e7173322982 /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | mergetools/diffmerge: support DiffMerge as a git mergetool (diff) | |
| parent | merge-recursive: fix parsing of "diff-algorithm" option (diff) | |
| download | git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.tar.gz git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.zip | |
Merge branch 'jk/diff-algo'
* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions