lp:~doxxx/bzr/mergetools-commands

Created by Gordon Tyler on 2010-11-12 and last modified on 2011-02-27
Get this branch:
bzr branch lp:~doxxx/bzr/mergetools-commands
Only Gordon Tyler can upload to this branch. If you are Gordon Tyler please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Gordon Tyler
Project:
Bazaar
Status:
Development

Recent revisions

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.

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