← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/es/guia-usuario/resolving_conflicts.txt

  • Committer: Aaron Bentley
  • Date: 2006-06-05 17:51:53 UTC
  • mto: This revision was merged to the branch mainline in revision 1745.
  • Revision ID: aaron.bentley@utoronto.ca-20060605175153-3a1af9d399f2ef5e
Only reserialize the working tree basis inventory when needed. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/guia-usuario/resolving_conflicts.txt