Better Merge parsing#116

Merged

linzhp merged 3 commits into

SoftwareIntrospectionLab:developfrom

apepper:hunks_merge_fix

Aug 19, 2011

Commits on Aug 11, 2011

Catch MalformedHunkHeader if "allow_dirty". This can be, when the output of diff is a merge.
apepper
committed
[Git] Better parsing for Merge-Commits.
apepper
committed
[Git] File Change "T" - Type Change added as a modification.
apepper
committed