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>2007-12-02 23:07:18 -0600
committerDan McGee <dan@archlinux.org>2007-12-02 23:07:18 -0600
commitf07a800fab2192dd64957bf2a30c71f6ccbe3592 (patch)
treed9bee2b0121037a876c90cc6b24ce17f7c32bc43 /pactest/tests/fileconflict001.py
parent4ce004a846ec70c802a4964a41233ca0247dbdb1 (diff)
parent09253b48d60589d42d9486dd361eaaf30e364e59 (diff)
Merge branch 'maint' into working
Diffstat (limited to 'pactest/tests/fileconflict001.py')
0 files changed, 0 insertions, 0 deletions