01368e5d9d
When maintaining or merging patches, one of the most common sources for conflicts are the list of objects in makefiles. Especially when the split across lines has been changed on both sides, which is somewhat common due to attempting to stay below 80 columns, those conflicts are unnecessarily laborious to resolve. By splitting, and alphabetically sorting, OBJS style lines into one object per line, conflicts should be less frequent, and easier to resolve when they still occur. Author: Andres Freund Discussion: https://postgr.es/m/20191029200901.vww4idgcxv74cwes@alap3.anarazel.de |
||
|---|---|---|
| .. | ||
| expected | ||
| sql | ||
| .gitignore | ||
| Makefile | ||
| pg_stat_statements--1.0--1.1.sql | ||
| pg_stat_statements--1.1--1.2.sql | ||
| pg_stat_statements--1.2--1.3.sql | ||
| pg_stat_statements--1.3--1.4.sql | ||
| pg_stat_statements--1.4--1.5.sql | ||
| pg_stat_statements--1.4.sql | ||
| pg_stat_statements--1.5--1.6.sql | ||
| pg_stat_statements--1.6--1.7.sql | ||
| pg_stat_statements--unpackaged--1.0.sql | ||
| pg_stat_statements.c | ||
| pg_stat_statements.conf | ||
| pg_stat_statements.control | ||