Honor --cc diffs as well

[paulirish]

as mentioned in #20,

Any merge conflict will end up with diff --cc instead of diff --git.

---

I was thinking of using a shortformat style to pick up the filenames, like so…

/chromium/src/third_party/WebKit/Source/devtools on heads/master ⁂
$ git diff --stat
 Source/devtools/front_end/timeline/TimelinePanel.js | Unmerged
 Source/devtools/front_end/timeline/TimelinePanel.js |  5 +++++
 Source/devtools/front_end/ui/Dialog.js              | Unmerged
 Source/devtools/front_end/ui/Dialog.js              | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

~/chromium/src/third_party/WebKit/Source/devtools on heads/master ⁂
$ git diff --numstat
0       0       Source/devtools/front_end/timeline/TimelinePanel.js
5       0       Source/devtools/front_end/timeline/TimelinePanel.js
0       0       Source/devtools/front_end/ui/Dialog.js
20      0       Source/devtools/front_end/ui/Dialog.js

... but that doesn't really work with the text splitting thing you got going.

---

anyway this works! fixes #20

[paulirish]

regex updated.

[scottgonzalez]

This is now available in v0.4.0.

Thanks!