diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:39 -0700 |
| commit | b330051982756f2f18a6718e603ceb99302dc16e (patch) | |
| tree | daea29744bcc0dcdba2bfec51c2a01b500692c29 /builtin/merge.c | |
| parent | Merge branch 'jc/makefile-redirection-stderr' (diff) | |
| parent | api-trace.txt: fix typo (diff) | |
| download | tgif-b330051982756f2f18a6718e603ceb99302dc16e.tar.xz | |
Merge branch 'ep/trace-doc-sample-fix'
Fix a typo in an example in the trace API documentation.
* ep/trace-doc-sample-fix:
api-trace.txt: fix typo
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions