| 2008-06-11 | Merge branch 'maint' | blob | diff | raw | |
| 2008-06-09 | Merge branch 'js/merge-recursive' | blob | diff | raw | |
| 2008-06-09 | merge-recursive: respect core.autocrlf when writing... | blob | diff | raw | |
| 2008-06-09 | Add testcase for merging in a CRLF repo | blob | diff | raw | diff to current | |