tkreis/gist:4534822

Created January 15, 2013 00:17

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/tkreis/4534822.js"></script>
Save tkreis/4534822 to your computer and use it in GitHub Desktop.

Download ZIP

merge file from different branch with current file

Raw

gistfile1.txt

	git checkout --merge "branch" "file"
	git mergetool

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