Created
May 18, 2016 22:51
-
-
Save jkrup/6707a17c2e0e28412c089ccfe775fa36 to your computer and use it in GitHub Desktop.
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
| # find diffs in files that were affected by merge conflict | |
| git diff --cached `echo **/*.orig | sed s/.orig//` |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment