lp://staging/~doxxx/bzr/mergetools-commands

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/bzr

Vincent Ladeuil: Needs Fixing on 2011-02-09

Diff: 291 lines (+128/-19)

6 files modified

bzrlib/builtins.py (+41/-13)
bzrlib/conflicts.py (+45/-1)
bzrlib/mergetools.py (+18/-5)
bzrlib/tests/test_mergetools.py (+15/-0)
doc/en/release-notes/bzr-2.4.txt (+4/-0)
doc/en/whats-new/whats-new-in-2.4.txt (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #489915: [master] external diff/merge configuration needs serious rework

Medium

Fix Released

Link a bug report

Related blueprints

5426. By Gordon Tyler on 2011-02-27

Extracted helper function get_mergetool_cmdline.

5425. By Gordon Tyler on 2011-02-27

Make it clear that it's a merge tool action.

5424. By Gordon Tyler on 2011-02-27

cmd_resolve: Changed mergetool user feedback to be consistent with auto mode.

5423. By Gordon Tyler on 2011-02-25

Cleanup according to vila's suggestions.

5422. By Gordon Tyler on 2011-02-25

resolve_conflicts returns 0 or first non-zero retval from mergetool.

5421. By Gordon Tyler on 2011-02-25

Merged from bzr.dev.

5420. By Gordon Tyler on 2011-01-21

Merged mergetools into mergetools-commands.

5419. By Gordon Tyler on 2011-01-20

Moved info from whats-new-in-2.3.txt to whats-new-in-2.4.txt.

5418. By Gordon Tyler on 2011-01-20

Merged mergetools into mergetools-commands.

5417. By Gordon Tyler on 2011-01-20

Moved mergetools-commands NEWS from bzr-2.3.txt to bzr-2.4.txt.