/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/getting_help.txt

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/getting_help.txt
 
1
Getting help
 
2
============
 
3
 
 
4
Bazaar comes with a built-in on-line help system. To see the list of topics,
 
5
the command is::
 
6
 
 
7
  bzr help
 
8
 
 
9
To see the list of commands, the command is::
 
10
 
 
11
  bzr help commands
 
12
 
 
13
To get help on topic xxx or command xxx, the command is::
 
14
 
 
15
  bzr help xxx
 
16
 
 
17
If you wish to search the help or read it as a larger document, the
 
18
information is also available in the Bazaar User Reference.
 
19