Merge lp:~vila/bzr/mergetool-doc into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6569 |
Proposed branch: | lp:~vila/bzr/mergetool-doc |
Merge into: | lp:bzr |
Diff against target: |
25 lines (+16/-0) 1 file modified
bzrlib/help_topics/en/configuration.txt (+16/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/mergetool-doc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+125150@code.launchpad.net |
Commit message
Clarify how `mergetool` templates should be used with `bzr config`.
Description of the change
Basde on an IRC discussion with mgz.
I think that should address
https:/
To post a comment you must log in.
So, I don't like "the following will (rightly) break", and perhaps we don't want to give the "wrong" version at all, but perhaps it's useful for people doing a search on the error message? So, just tone down the "we write software that's hard to use on purpose" angle and this should be fine.