/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: Robert Collins
  • Date: 2005-10-20 09:20:46 UTC
  • Revision ID: robertc@robertcollins.net-20051020092046-f41cd3e0c9896b98
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)

'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be 
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)

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