| commit | 6d3411fe3f7b74e71870c84be03fc32f732261e3 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Jan 15 15:50:49 2015 +0900 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Mon Jan 19 09:52:30 2015 +0900 |
| tree | b92429ca967b45d979d29db22fc4d8d1d1d06118 | |
| parent | e4e8315cc625cbc75a71662f110cc16038012810 [diff] |
Make merge failure error messages consistent Change-Id: I9f33fc629587e7b03863d7b3a1f6ed8051d9e56d