diff options
| author |  Nicolas Pitre <nico@cam.org> | 2007-10-30 14:57:33 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-10-30 16:08:40 -0700 |
| commit | 4d4fcc5451d9d653bebcc8afa18543cb426abeed (patch) | |
| tree | 4cf86181f94c46f0c56317132ac42dd403c71674 /git-mergetool.sh | |
| parent | make struct progress an opaque type (diff) | |
| download | tgif-4d4fcc5451d9d653bebcc8afa18543cb426abeed.tar.xz | |
relax usage of the progress API
Since it is now OK to pass a null pointer to display_progress() and
stop_progress() resulting in a no-op, then we can simplify the code
and remove a bunch of lines by not making those calls conditional all
the time.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions