/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 .rsyncexclude

  • 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:
.rsyncexclude
 
1
*.pyc
 
2
*.pyo
 
3
*~
 
4
# arch can bite me
 
5
{arch}
 
6
.arch-ids
 
7
,,*
 
8
++*
 
9
/doc/*.html
 
10
*.tmp
 
11
bzr-test.log
 
12
[#]*#
 
13
.#*
 
14
testrev.*
 
15
/tmp
 
16
# do want this after all
 
17
+ CHANGELOG