diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:44:29 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:14:39 +0100 |
| commit | 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 (patch) | |
| tree | 30b12593ca68f6e45a6caaccdaad80881e03207f /debian/changelog | |
| parent | 91f6d93d44a430cb206457e356f70eda18f714a0 (diff) | |
git-debrebase: Merges: Enable with command-line option instead of env var
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 98c0383..614a576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ dgit (6.7~) unstable; urgency=medium not in series, because they will be deleted. Closes:#904997. * changelog: Add close note for #905400 to changelog entry for 6.5. * git-debrebase: convert-from-gbp: Improve messages. Closes:#906641. + * git-debrebase: Highly experimental merge resolution support, + enabled only with special command line option. -- |