Commit Diff
--- lib/worktree.c +++ lib/worktree.c @@ -1512,8 +1512,6 @@ done: free(tmppath); return err; } - -static const struct got_error *skip_one_line(FILE *); /* * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a
--- lib/worktree.c +++ lib/worktree.c @@ -1512,8 +1512,6 @@ done: free(tmppath); return err; } - -static const struct got_error *skip_one_line(FILE *); /* * Upgrade STATUS_MODIFY to STATUS_CONFLICT if a