Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/pactest/tests/fileconflict001.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-09-14 22:10:20 -0500
committerDan McGee <dan@archlinux.org>2009-09-14 22:10:20 -0500
commit95cb4b6874424c7109df0f8cebefc17d3756d65f (patch)
tree76149dd73014667136518a70250d80da840e396f /pactest/tests/fileconflict001.py
parentb4317a740ac2d4f5e4d1aa56a97171c52be70d02 (diff)
parentd0d6c58c0579ec4d6ada9a9f91acc93215ca2773 (diff)
Merge branch 'maint'
Diffstat (limited to 'pactest/tests/fileconflict001.py')
0 files changed, 0 insertions, 0 deletions