← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/ja/user-guide/resolving_conflicts.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-26 21:11:30 UTC
  • mfrom: (3711.4.3 autopack_bug_242510)
  • Revision ID: pqm@pqm.ubuntu.com-20080926211130-ojyixbni0jpqoify
(jam) When packing create a single new pack,
        fixes bugs #242510 and #172644

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/ja/user-guide/resolving_conflicts.txt