Commit 399f2b6294963b8a7a154ffd0103484d018c4e27

Jacques Germishuys 2014-04-07T20:15:45

Introduce git_merge__extract_conflict_paths