diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 12:36:14 -0700 |
| commit | 12ba0e771cb1af16d0ac074a6a9656cbf45494cc (patch) | |
| tree | 7b7062c329871bf8298251c45a74dada7b8635d9 /combine-diff.c | |
| parent | Merge branch 'sb/t9300-typofix' (diff) | |
| parent | t6031-test-merge-recursive: do not forget to add file to be committed (diff) | |
| download | tgif-12ba0e771cb1af16d0ac074a6a9656cbf45494cc.tar.xz | |
Merge branch 'sb/t6031-typofix'
* sb/t6031-typofix:
t6031-test-merge-recursive: do not forget to add file to be committed
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions