Skip to content

Instantly share code, notes, and snippets.

@devrath

devrath/Android Studio as Diff and Merge Tool

Created May 8, 2022 06:17
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save devrath/2f9b9e813e68bbf8f2131ab7aa78fdeb to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save devrath/2f9b9e813e68bbf8f2131ab7aa78fdeb to your computer and use it in GitHub Desktop.
Download ZIP
Snippet of how to use android studio as diff tool and merge tool
Raw
Android Studio as Diff and Merge Tool
[merge]
tool = studio
[mergetool "studio"]
prompt = false
cmd = /Applications/Android\\ Studio.app/Contents/MacOS/studio merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[diff]
tool = studio
[difftool "studio"]
prompt = false
cmd = /Applications/Android\\ Studio.app/Contents/MacOS/studio diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment