|
4869.4.1
by Andrew Bennetts
Add plugin for merging bzr's NEWS file to contrib/. |
1 |
A plugin for merging bzr's NEWS file. |
2 |
||
|
4869.3.34
by Vincent Ladeuil
Finish the patch based on reviews. |
3 |
This plugin is activated via configuration variables, see 'bzr help news_merge'. |
|
4869.4.1
by Andrew Bennetts
Add plugin for merging bzr's NEWS file to contrib/. |
4 |
|
5 |
This hook can resolve conflicts where both sides add entries at the same place. |
|
6 |
If it encounters a more difficult conflict it gives up and bzr will fallback to |
|
7 |
the default merge algorithm. |