diff options
Diffstat (limited to 'etc/examples/189-merge-conflict.5.diff')
| -rw-r--r-- | etc/examples/189-merge-conflict.5.diff | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/etc/examples/189-merge-conflict.5.diff b/etc/examples/189-merge-conflict.5.diff deleted file mode 100644 index 8e9ddab9..00000000 --- a/etc/examples/189-merge-conflict.5.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --cc src/handlers/merge_conflict.rs -index 888eee8b,7ea2e9d3..00000000 ---- a/src/handlers/merge_conflict.rs -+++ 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> { - self.painter.emit()?; -++<<<<<<< HEAD - + // hello -++||||||| e641341d -++======= -+ // bye -++>>>>>>> b - let mut handled_line = false; - if matches!(self.state, State::Unknown) { - if let Some(process::CallingProcess::GitShow(_, extension)) = |