thumbot/merge.txt Secret

Created December 16, 2016 16:56

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/thumbot/53e89e7db4183779fea4f823a7a27e00.js"></script>
Save thumbot/53e89e7db4183779fea4f823a7a27e00 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

	Merge made by the 'recursive' strategy.
	testfile2 \| 2 +-
	1 file changed, 1 insertion(+), 1 deletion(-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment