diff options
Diffstat (limited to 'merge-with-testing')
| -rw-r--r-- | merge-with-testing | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-with-testing b/merge-with-testing index 6bf61e7aba10..0abe94aca6c8 100644 --- a/merge-with-testing +++ b/merge-with-testing @@ -20,6 +20,6 @@ grep ^pkgrel PKGBUILD git checkout master echo "Automerging configs" -git checkout merge -- config config.x86_64 +git checkout merge -- config.i686 config.x86_64 echo "All done, you can now do git checkout --patch merge PKGBUILD" |