Merge lp:~pickscrape/bzr-extmerge/choose-mergetool into lp:~zindar/bzr-extmerge/trunk
Proposed by
Russ Brown
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp:~pickscrape/bzr-extmerge/choose-mergetool |
| Merge into: | lp:~zindar/bzr-extmerge/trunk |
| To merge this branch: | bzr merge lp:~pickscrape/bzr-extmerge/choose-mergetool |
| Related bugs: |
To post a comment you must log in.
Unmerged revisions
- 11. By Russ Brown
-
Offer the user the choice of which merge tool they would like to use if it is not configured.
Also prompts about how to configure it.
