1 |
On 03/31/2014 12:00 AM, Alexander Berntsen wrote: |
2 |
> On 31/03/14 04:06, Brian Dolbec wrote: |
3 |
>> It all looked really good to me. {:-D |
4 |
> Yep. |
5 |
> |
6 |
> Please update the commit messages to follow DEVELOPING though. |
7 |
> |
8 |
|
9 |
Sure. How are the following updates? |
10 |
|
11 |
For the first patch, I'll remove the second message line so the |
12 |
message is only: |
13 |
Move -MERGING- string to a constant |
14 |
|
15 |
For the second patch, I'll update the message to: |
16 |
Add emaint module that handles failed merges |
17 |
|
18 |
The emaint module can scan for failed merges and fix any failed merges |
19 |
found. The emaint module also keeps track of failed merges using a |
20 |
tracking file. |
21 |
|
22 |
Regards, |
23 |
Pavel |