Merge lp://staging/~jelmer/bzr-builddeb/allow-merge-mode-bzr-builddeb into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Merged at revision: | 479 |
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/allow-merge-mode-bzr-builddeb |
| Merge into: | lp://staging/bzr-builddeb |
| Diff against target: |
53 lines (+18/-3) 2 files modified
cmds.py (+6/-3) util.py (+12/-0) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/allow-merge-mode-bzr-builddeb |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes the automatic detection of merge mode if a .bzr-builddeb directory is present.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
