Thomas Gummerer writes:
> Factor out the handle_conflict function, which handles a single
> conflict in a path. This is in preparation for a subsequent commit,
> where this function will be re-used. No functional changes intended.
>
> Signed-off-by: Thomas Gummerer
> ---
> rerere.c | 87
Factor out the handle_conflict function, which handles a single
conflict in a path. This is in preparation for a subsequent commit,
where this function will be re-used. No functional changes intended.
Signed-off-by: Thomas Gummerer
---
rerere.c | 87
2 matches
Mail list logo
