diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-30 03:50:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-30 03:50:31 +0400 |
| commit | d1c8c0c8c42912eb768a05115c798de50e595f8b (patch) | |
| tree | 6fdc20e6a100a21c0c9dbae6bcb0ab9e543a4fed /ll-merge.c | |
| parent | 3e8a00ae1d529e61f38f36fdb504902064cf1f5d (diff) | |
| parent | a2dc04ba159def766ee17db00c60bdbda477955d (diff) | |
Merge branch 'maint'
* maint:
diff -c -p: do not die on submodules
Conflicts:
combine-diff.c
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions