lp:~andidog/bzr/diff-merge-tools

Created by Andreas Sommer on 2012-04-30 and last modified on 2012-05-09
Get this branch:
bzr branch lp:~andidog/bzr/diff-merge-tools
Only Andreas Sommer can upload to this branch. If you are Andreas Sommer please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Andreas Sommer
Project:
Bazaar
Status:
Development

Recent revisions

6531. By Andreas Sommer on 2012-05-09

Added KDiff3 as predefined diff tool

6530. By Andreas Sommer on 2012-05-09

Added WinMerge 2.x as predefined diff tool

6529. By Andreas Sommer on 2012-05-08

Added meld as predefined diff tool

6528. By Andreas Sommer on 2012-05-07

Added --ui option and default diff tool functionality for bzr diff, added default tools from TortoiseSVN

Also added is_default, is_gui, filename_regex, file_types options for diff tools

6527. By Andreas Sommer on 2012-05-07

check_availability expands environment variables first

6526. By Andreas Sommer on 2012-05-07

Moved difftools and mergetools invocation functions into common invocation module, marked mergetools functions deprecated

6525. By Andreas Sommer on 2012-05-07

Allowed environment variable expansion in diff tool command lines

6524. By Andreas Sommer on 2012-05-01

Initial implementation of bzrlib.difftools module and "bzr diff --tool" parameter

6523. By Patch Queue Manager <email address hidden> on 2012-04-19

(vila) Avoid test sphinx-related failures now that we don't have direct
 sphinx anymore. (Vincent Ladeuil)

6522. By Patch Queue Manager <email address hidden> on 2012-04-16

(jelmer) Add --overwrite-tags option to push and pull. (Jelmer Vernooij)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers