/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/merging_changes.txt

  • Committer: Guillermo Gonzalez
  • Date: 2008-07-09 20:15:29 UTC
  • mto: (3542.1.1 logdisplayers)
  • mto: This revision was merged to the branch mainline in revision 3556.
  • Revision ID: guillo.gonzo@gmail.com-20080709201529-sssx8g4paymb3qzs
 * fixed typo LogFormatter.show_properties in docstring
 * added test for bad argument in property handler TestLongLogFormatter.test_properties_handler_bad_argument
 * moved NEWS entry from BUGFIXES to IMPROVEMENTS

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
53
53
 
54
54
Note that some merges can only be completed with the assistance
55
55
of a human. Details on how to resolve these are given in
56
 
`Resolving conflicts <resolving_conflicts.html>`_.
 
56
`Resolving conflicts`_.
57
57
 
58
58
Recording a merge
59
59
-----------------