lp:~doxxx/bzr/mergetools
Created by
Gordon Tyler
and last modified
Only
Gordon Tyler
can upload to this branch. If you are
Gordon Tyler
please log in for upload directions.
Branch merges
Propose for merging
1 branch
dependent on this one.
- Vincent Ladeuil: Approve
- Andrew Bennetts: Needs Fixing
- John A Meinel: Pending requested
- Martin Packman: Pending requested
-
Diff: 603 lines (+449/-12)12 files modifiedbzrlib/config.py (+19/-0)
bzrlib/help_topics/en/configuration.txt (+34/-0)
bzrlib/mergetools.py (+116/-0)
bzrlib/osutils.py (+33/-0)
bzrlib/tests/__init__.py (+1/-0)
bzrlib/tests/features.py (+6/-11)
bzrlib/tests/test_cmdline.py (+0/-1)
bzrlib/tests/test_config.py (+39/-0)
bzrlib/tests/test_mergetools.py (+167/-0)
bzrlib/tests/test_osutils.py (+22/-0)
doc/en/release-notes/bzr-2.4.txt (+6/-0)
doc/en/whats-new/whats-new-in-2.4.txt (+6/-0)
Related bugs
Bug #489915: [master] external diff/merge configuration needs serious rework | Medium | Fix Released |
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr