tree 162471ccb68c91e44a23d4abb0e2d44a5bf12e86
parent 867c987c9d368d9c3159770955fbd0c43fb6fb74
author Tim Zimmermann <tim@linux4.de> 1712031831 +0200
committer Tim Zimmermann <tim@linux4.de> 1712031925 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuwYxAyE4TRnuhLgPbcIaY/gZxe8FAmYLiLYACgkQbcIaY/gZ
 xe/E1g//ZPponIrhzfpjYxSTjamFgB25NeMT4NQklx4t6RAlG6fQFVSY4lJiz5+g
 vlKF78TU+QwQgyM4zGe/OD0VKAZfNwk0xoXOWLYp79Lpeei/qnG0Ug7m5x621LjK
 jKCERGu2sFeq3G8jQdHOBsMy3crvoYuI/pypVmIA0Hpy3LwN+5DsgbkEHZyZvcoK
 Hhto7jDjjUEWW7mSeIPe7nUdOrQ8EG5SILWf8v0xKELhB5GUWi/kXkWFvR+c4n8D
 Faur3viK+PShAeezJMcg0OS3dIJ89p08yQ/361ib6Ab1Or5OGN52xmAgn+CRtsWB
 I11Uc9rByoWAwS0hTTOp3Jiw53z576muJ9CS/nYtCCmBLxVGING709yE/z0/tdon
 JBb+fiDOebQS210AWuuF6IdqARHaebDq1PwqnoqBLtgqclMnXpdjDM1gDIRgZnBV
 Z9odhX5ZGWFxtzOxkLTOSpqevJNLnT4jOox6XcaBaFXquDu4Je/ekgqliqmyTW9G
 4co0oGhf08cvg9Qdk0hfQ5TZDgJ5Zk9hneq9IamQ4Zq3owlVPQh/oNTazlGJ4ZkB
 jywQjvYvVVp2yBZwX7tAmaJit5bdGufLbTov6qoVj7LGR1CPEsN3b3gVE31Ggc38
 Xwqn0Wq3nQEXBjAoer2O1NunNLAuurpjdhALQVJa8JhO+Yv29eY=
 =9Kt8
 -----END PGP SIGNATURE-----

scripts: aosp-merger: Support per-project branches

* Also allow specifying an alternative merge file

Change-Id: Iddd526eabeb5ecc4112066d6a03c1acbab5d5a9b