diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:17 -0800 |
| commit | 934c042c9cf09a14762b3fa094f1ba15ec721161 (patch) | |
| tree | f88ed03c5046a4d42a85ea52632eb9f084916e8a /ll-merge.h | |
| parent | 7ef705eff6afbc676ab2999dbcdb1a7c8fbf62e6 (diff) | |
| parent | 32ca42491246eb00d226826039fff18d58b57081 (diff) | |
| download | git-934c042c9cf09a14762b3fa094f1ba15ec721161.tar.gz | |
Merge branch 'rs/pretty-wrap'
* rs/pretty-wrap:
log --format: don't ignore %w() at the start of format string
Implement wrap format %w() as if it is a mode switch
Conflicts:
pretty.c
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions