Merge branch 'pw/diff-color-moved-ws-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:06 +0000 (13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:06 +0000 (13:34 +0900)
Various fixes to "diff --color-moved-ws".

* pw/diff-color-moved-ws-fix:
diff --color-moved: fix a memory leak
diff --color-moved-ws: fix another memory leak
diff --color-moved-ws: fix a memory leak
diff --color-moved-ws: fix out of bounds string access
diff --color-moved-ws: fix double free crash

1  2 
diff.c
diff --cc diff.c
Simple merge