~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(mbp) improved documentation for stacking

Show diffs side-by-side

added added

removed removed

Lines of Context: