diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:44:22 -0800 |
| commit | 684d0d8dcfa2288744a553fc7294c5f9f5c12026 (patch) | |
| tree | d790223199de25afa95aeb898d1b85d1e1dd3e1c /builtin-merge.c | |
| parent | 261fbda903762b9c47e4138312673ea25555d9e5 (diff) | |
| parent | 9fa708dab1ccf8be69a606ca4eb58e62f3ef334a (diff) | |
| download | git-684d0d8dcfa2288744a553fc7294c5f9f5c12026.tar.gz git-684d0d8dcfa2288744a553fc7294c5f9f5c12026.tar.xz | |
Merge branch 'jc/pretty-lf'
Conflicts:
pretty.c
t/t6006-rev-list-format.sh
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions