To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/merge3.py
- Committer: Breezy landing bot
- Date: 2020-03-21 23:20:27 UTC
- mfrom: (7490.12.1 local-git-key)
- mto: (7467.4.7 renames) (7498.1.1 merge-3.1) (7490.29.1 work) (7500.1.1 trunk-merge-3.1) (7506.1.1 merge-3.1) (7510.1.1 merge-3.1) (7515.1.1 merge-3.1) (7516.1.1 merge-3.1) (7518.1.1 merge-3.1) (7519.1.1 merge-3.1) (7520.1.1 merge-3.1) (7524.2.1 merge-3.1) (7526.2.1 merge-3.1)
- mto: This revision was merged to the branch mainline in revision 7499.
- Revision ID: breezy.the.bot@gmail.com-20200321232027-5fe2qsxpa2oa245b
Support user.signingkey configuration variable in .git/config.
Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000
Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000
- files added:
- breezy/cleanup.py
- files removed:
- doc/en/release-notes/brz-3.2.txt
- files modified:
- .testr.conf
added
removed
breezy/merge3.py
