diff options
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/merge-snapshot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 6e686307c8e..d070420d283 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -13,7 +13,7 @@ my $git = Git::Wrapper->new(getcwd); ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable" or $git->checkout("athena/unstable"); -my ($to_merge) = $git->merge_base("melete", "origin/emacs-29"); +my ($to_merge) = $git->merge_base("melete", "origin/master"); chomp(my $prev_version = `dpkg-parsechangelog -SVersion`); chomp(my $prev_distn = `dpkg-parsechangelog -SDistribution`); |