Advertisement
Guest User

diff3

a guest
Apr 4th, 2017
83
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.13 KB | None | 0 0
  1. echo -e "a\nb\nc" > o
  2. echo -e "A\nb\nc" > a
  3. echo -e "a\nB\nc" > b
  4. diff3 -E -m a o b
  5. <<<<<<< a
  6. A
  7. b
  8. =======
  9. a
  10. B
  11. >>>>>>> b
  12. c
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement