Andrii Nakryiko bbe442da7a sync: allow 3-way merge for patching to simplify manual conflict resolution ...

Allowing --3way leaves conflicts in the local files, which makes manual
conflict resolution so much easier.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>

2020-08-25 00:53:18 -07:00

..

check-reallocarray.sh

check-reallocarray.sh: Use the same compiler Make does

2020-07-28 14:05:35 -07:00

coverity.sh

coverity: explicitly use bash instead of sh

2019-11-05 13:28:13 -08:00

sync-kernel.sh

sync: allow 3-way merge for patching to simplify manual conflict resolution

2020-08-25 00:53:18 -07:00