diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-16 15:03:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-16 15:03:58 -0800 |
| commit | 1596456309315befb3fd0a985d50a70ed09493e4 (patch) | |
| tree | f31fd1230becd9f0466f2350a8eeb5a27f5ec247 /Documentation/git-merge.txt | |
| parent | builtin-apply: stronger indent-with-on-tab fixing (diff) | |
| download | tgif-1596456309315befb3fd0a985d50a70ed09493e4.tar.xz | |
builtin-commit: fix summary output.
Because print_summary() forgot to call diff_setup_done() after futzing with
diff output options, it failed to activate recursive diff, which resulted in
an incorrect summary.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions