diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-01 15:24:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-01 15:24:08 -0700 |
| commit | d9291ecf4f863479c69afc8074d1d260be9a7a95 (patch) | |
| tree | 8d2fc36c958163d7525b4e15354329ef3645b05e /mergetools/bc3 | |
| parent | Merge branch 'tr/remote-tighten-commandline-parsing' (diff) | |
| parent | pretty: remove intermediate strbufs from pp_user_info() (diff) | |
| download | tgif-d9291ecf4f863479c69afc8074d1d260be9a7a95.tar.xz | |
Merge branch 'rs/pp-user-info-without-extra-allocation'
* rs/pp-user-info-without-extra-allocation:
pretty: remove intermediate strbufs from pp_user_info()
pretty: simplify output line length calculation in pp_user_info()
pretty: simplify input line length calculation in pp_user_info()
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions