~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/README

• browse files at revision 1185.12.3
• compare with another revision
• download diff
• download tarball
• view history from revision 1185.12.3

• reverse the comparison (1185.12.3 to 5469.1.2)
• stop comparing with revision 5469.1.2

Show diffs side-by-side

added

removed

bzrlib/plugins/news_merge/README

1

 

A plugin for merging bzr's NEWS file.

2

 

 

3

 

This plugin is activated via configuration variables, see 'bzr help news_merge'.

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.

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1