On Tue, Aug 30, 2022 at 08:33:55AM -0400, Josiah Frentsos wrote:
> diff 360f3aea9198de6c93e8a185f87641b59c96dbfe ac5fe51778a0c0688246aa35c0f17c11526100d4
> commit - 360f3aea9198de6c93e8a185f87641b59c96dbfe
> commit + ac5fe51778a0c0688246aa35c0f17c11526100d4

The following files should not be touched by this diff because
they originate from elsewhere, and introducing local changes
can make merging from upstream more difficult later.

I will commit the rest of your changes, thanks!

> --- lib/arraylist.h
> +++ lib/arraylist.h
> @@ -30,7 +30,7 @@
>   *         // list.head may change due to realloc:
>   *         ARRAYLIST_ADD(x, list);
>   *         if (!x)
> - *                 return ENOMEM; 
> + *                 return ENOMEM;
>   *         *x = random_foo_value;
>   * }
>   * for (i = 0; i < list.len; i++)
> blob - a66c49edad2dad5800dbe4eb0deb37ed923834ac
> blob + 2d99547edeb5f5ca124fb5bd26e3b3f6172c8cb0
> --- lib/bloom.c
> +++ lib/bloom.c
> @@ -5,14 +5,14 @@
>   * Redistribution and use in source and binary forms, with or without
>   * modification, are permitted provided that the following conditions are
>   * met:
> - * 
> + *
>   * 1. Redistributions of source code must retain the above copyright
>   * notice, this list of conditions and the following disclaimer.
> - * 
> + *
>   * 2. Redistributions in binary form must reproduce the above copyright
>   * notice, this list of conditions and the following disclaimer in the
>   * documentation and/or other materials provided with the distribution.
> - * 
> + *
>   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> blob - 51c848e8470bd02ed14a2bc377a173e39836239c
> blob + 9321696d4c4601fada1aa807615b76ba5d6e7d2f
> --- lib/bloom.h
> +++ lib/bloom.h
> @@ -5,14 +5,14 @@
>   * Redistribution and use in source and binary forms, with or without
>   * modification, are permitted provided that the following conditions are
>   * met:
> - * 
> + *
>   * 1. Redistributions of source code must retain the above copyright
>   * notice, this list of conditions and the following disclaimer.
> - * 
> + *
>   * 2. Redistributions in binary form must reproduce the above copyright
>   * notice, this list of conditions and the following disclaimer in the
>   * documentation and/or other materials provided with the distribution.
> - * 
> + *
>   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> blob - 5e816ae10b5948c0aeacd27365a91f3147b96baf
> blob + d60c9119666e6eff2ff1a6ed9b49d499eab4b4de
> --- lib/diff_main.h
> +++ lib/diff_main.h
> @@ -200,7 +200,7 @@ extern int diff_algo_patience(
>   * 	// If subdivision failed, do Myers Divide et Impera:
>   * 	.fallback_algo = &myers_then_myers_divide,
>   * };
> - * 
> + *
>   * const struct diff_algo_config myers_divide = (struct diff_algo_config){
>   * 	.impl = diff_algo_myers_divide,
>   * 	// When division succeeded, start from the top:
> blob - 9053d5ede0bd99a581091419908a0bad6cceb9da
> blob + 80989d772d0b27c488e758e1d5be7daf76b4e8ea
> --- lib/diff_output_plain.c
> +++ lib/diff_output_plain.c
> @@ -39,7 +39,7 @@ diff_output_plain(struct diff_output_info **output_inf
>  		return EINVAL;
>  	if (result->rc != DIFF_RC_OK)
>  		return result->rc;
> -	
> +
>  	if (output_info) {
>  		*output_info = diff_output_info_alloc();
>  		if (*output_info == NULL)