diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2023-03-21 14:54:17 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2023-03-21 14:54:17 -0700 |
| commit | 343a3fa966f28350911fc85346df2023b6a610d5 (patch) | |
| tree | 824d0dd25eda56cb147adf38510cb9a7f1fd8430 /debian | |
| parent | 050e01610b298c1fe0b2324557a9f3d0b9ce29ec (diff) | |
| download | emacs-343a3fa966f28350911fc85346df2023b6a610d5.tar.gz | |
return to merging from master
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`); |