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/textmerge.py
- Committer: Jelmer Vernooij
- Date: 2017-05-21 19:09:26 UTC
- mfrom: (6622.1.36 breezy)
- Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.
- files added:
- doc/en/release-notes/brz-3.0.txt
- files removed:
- bzr.ico
- files renamed:
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzr => brz
- contrib/bash/bzr => contrib/bash/brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- po/bzr.pot => po/brz.pot
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
breezy/textmerge.py
