diff options
Diffstat (limited to 'etc/examples/189-merge-conflict.5.diff')
| -rw-r--r-- | etc/examples/189-merge-conflict.5.diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/examples/189-merge-conflict.5.diff b/etc/examples/189-merge-conflict.5.diff index 8e9ddab9..d22571c1 100644 --- a/etc/examples/189-merge-conflict.5.diff +++ b/etc/examples/189-merge-conflict.5.diff @@ -4,7 +4,7 @@ index 888eee8b,7ea2e9d3..00000000 +++ b/src/handlers/merge_conflict.rs @@@ -5,7 -5,7 +5,12 @@@ use crate::utils::process impl<'a> StateMachine<'a> { - pub fn handle_merge_confict_line(&mut self) -> std::io::Result<bool> { + pub fn handle_merge_conflict_line(&mut self) -> std::io::Result<bool> { self.painter.emit()?; ++<<<<<<< HEAD + // hello |