Rename merge_transaction_into to merge_transactions

This commit is contained in:
Antonio Scandurra 2023-08-24 14:26:42 +02:00
parent 9674b03855
commit 71a5964c18
4 changed files with 9 additions and 18 deletions

View file

@ -1294,12 +1294,8 @@ impl Buffer {
self.text.forget_transaction(transaction_id);
}
pub fn merge_transaction_into(
&mut self,
transaction: TransactionId,
destination: TransactionId,
) {
self.text.merge_transaction_into(transaction, destination);
pub fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
self.text.merge_transactions(transaction, destination);
}
pub fn wait_for_edits(