Commit 6fefb7af84170fb67a7e6c8493fc00421787bb87

Jacques Germishuys 2014-04-13T19:53:35

Capture conflict information in MERGE_MSG for revert and merge