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

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
diff.c