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 /contrib/workdir | |
| parent | c5f424fd014488bd8a92b97f52bfe47823bc2128 (diff) | |
| parent | 6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64 (diff) | |
| download | git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.tar.gz git-92d2afd563afca4d6b4c20c7e2e859bc7219a3b1.tar.xz | |
Merge branch 'jk/diff-algo'
* jk/diff-algo:
merge-recursive: fix parsing of "diff-algorithm" option
Diffstat (limited to 'contrib/workdir')
0 files changed, 0 insertions, 0 deletions