gistfile1.txt

### trying to merge trunk -> project

Conflict adding files to features.  Created directory.
Conflict because features is not versioned, but has versioned children.  Versioned directory.
Conflict adding file features.  Moved existing file to features.moved.
Conflict adding files to features/either.  Created directory.
Conflict because features/either is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to features/step_definitions.  Created directory.
Conflict because features/step_definitions is not versioned, but has versioned children.  Versioned directory.
Contents conflict in features/step_definitions/user_steps.rb
Contents conflict in features/step_definitions/webrat_steps.rb
Conflict adding files to features/support.  Created directory.
Conflict because features/support is not versioned, but has versioned children.  Versioned directory.
Contents conflict in features/support/paths.rb

### the missing revision from trunk

trunk.bound$ bzr log -v -r-1
------------------------------------------------------------
...
added:
  features/either/foo.feature
  features/support/ext.rb
modified:
  features/step_definitions/user_steps.rb
  features/step_definitions/webrat_steps.rb
  features/support/paths.rb