Andrii Nakryiko e78a36f4b0 sync: fix non-empty merge detection/handling ...

Fix how non-empty merge detection is done. Allow to proceed despite
non-empty merges (they will typically will cause conflicts during
applying patches, but if conflicts were handled already, it should be ok
to ignore this problem).

Also ensure that diff's output is in unified diff format.

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

2019-08-14 09:53:04 -07:00

..

check-reallocarray.sh

Fix redirect in check-reallocarray (#7)

2019-01-07 20:34:42 -08:00

sync-kernel.sh

sync: fix non-empty merge detection/handling

2019-08-14 09:53:04 -07:00