Advertisement
Guest User

Untitled

a guest
Apr 24th, 2014
395
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.43 KB | None | 0 0
  1. git mergetool
  2.  
  3. This message is displayed because 'merge.tool' is not configured.
  4. See 'git mergetool --tool-help' or 'git help config' for more details.
  5. 'git mergetool' will now attempt to use one of the following tools:
  6. opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare emerge vimdiff
  7. No known merge tool is available.
  8. android@builduntu:~/sense/frameworks/base$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement