diff options
| author |  Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-05 18:20:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-06 13:22:35 -0700 |
| commit | 221444f5d11a8fac84514447c2902430e237759c (patch) | |
| tree | 02189a1dfe8fb7cb8925f55ad6b8fe17c13f3b9c /bulk-checkin.c | |
| parent | rerere: fix crash with files rerere can't handle (diff) | |
| download | tgif-221444f5d11a8fac84514447c2902430e237759c.tar.xz | |
rerere: only return whether a path has conflicts or not
We currently return the exact number of conflict hunks a certain path
has from the 'handle_paths' function. However all of its callers only
care whether there are conflicts or not or if there is an error.
Return only that information, and document that only that information
is returned. This will simplify the code in the subsequent steps.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bulk-checkin.c')
0 files changed, 0 insertions, 0 deletions