[PATCH 0/4] pacdiff: learn (M)erge mode

This series teaches pacdiff to perform 3-way merges on config files. The first commit is a cleanup that should be done regardless of whether the rest of this series is merged. The next two commits are small refactors to make final change more readable. The last patch implements the bulk of the logic. It also includes some comment requests. Denton Liu (4): pacdiff: Reindent awk script pacdiff: Implement die() pacdiff: Reduce repetition in input loop pacdiff: Learn the (M)erge mode doc/pacdiff.8.txt | 9 +++- src/pacdiff.sh.in | 102 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 97 insertions(+), 14 deletions(-) -- 2.29.2.889.g5298b911bd