← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to .rsyncexclude

  • Committer: Martin Pool
  • Date: 2005-07-04 13:08:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve

- test cases for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
.rsyncexclude
15
15
/tmp
16
16
# do want this after all
17
17
+ CHANGELOG
18
 
/build
19
 
test*.tmp
20
 
.*.swp
21
 
*.orig
22
 
.*.orig
23
 
.bzr-shelf*