/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 contrib/fortune

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/fortune
 
1
#! /bin/sh
 
2
 
 
3
# Put this on your $BZRPATH to use it to demonstrate bzr external plugins
 
4
 
 
5
 
 
6
if [ x$1 == x--bzr-usage ]
 
7
then
 
8
    # options
 
9
    echo ""
 
10
    # arguments
 
11
    echo ""
 
12
    exit 0
 
13
elif [ x$1 == x--bzr-help ]
 
14
then
 
15
    echo "display a fortune cookie"
 
16
    echo 
 
17
    exit 0
 
18
else
 
19
    /usr/games/fortune
 
20
fi