Created
July 26, 2012 16:33
-
-
Save fernferret/3183094 to your computer and use it in GitHub Desktop.
How to read wiggle diffs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Here's how to read a diff that | |
| # wiggle puts in a file. | |
| # wiggle - http://linux.die.net/man/1/wiggle | |
| <<<<<<< | |
| Here's what I found. | |
| ||||||| | |
| Here's what the .rej file said I should find. | |
| ======= | |
| Here's what the .rej file said should be here. | |
| >>>>>>> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment