From 729c8b7dd7d71d0544b0b648d8d1ee57d39e62d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Test=C3=A9?= <david.teste@fratris.fr>
Date: Thu, 16 Dec 2021 16:14:41 +0100
Subject: [PATCH 1/2] A useful comment for batch merge

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index c04a44e..449fdf2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,6 +58,8 @@ pub struct CaesarEngine<A: Alphabet> {
     shifted_alphabet: Vec<char>,
 }
 
+// Yet a useful comment for batch-merge
+ 
 impl<A: Alphabet> CaesarEngine<A> {
     /// Creates a new
     pub fn new(shift: Shift) -> Self {

From 91941526c4d000ea8ab27bd7ebe14cffde5a79ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Test=C3=A9?= <david.teste@fratris.fr>
Date: Thu, 16 Dec 2021 16:16:30 +0100
Subject: [PATCH 2/2] Another comment for batch merge

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index c04a44e..854de9d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -133,6 +133,8 @@ pub struct ClearText<A> {
     message: String,
 }
 
+// Another comment which won't fail at rebase
+
 impl<A: Alphabet> ClearText<A> {
     pub fn try_new<T: ToString>(message: T) -> Result<Self, CharacterNotInAlphabet> {
         let message = message.to_string();