~bialix/bzr/2.3-configobj

Viewing all changes in revision 5621.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-08 12:50:51 UTC
  • mfrom: (5620.1.3 715058-resolve-text-subdir)
  • Revision ID: pqm@pqm.ubuntu.com-20110208125051-fpbdtofhgv7pwzgc
(vila) Handle test conflict resolution in subdirs. (Vincent Ladeuil)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: