Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git mergetool
- This message is displayed because 'merge.tool' is not configured.
- See 'git mergetool --tool-help' or 'git help config' for more details.
- 'git mergetool' will now attempt to use one of the following tools:
- opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare emerge vimdiff
- No known merge tool is available.
- android@builduntu:~/sense/frameworks/base$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement