TomMannson

public class AccountAuthenticator extends AbstractAccountAuthenticator {

  private final Context context;
  @Inject @ClientId String clientId;
  @Inject @ClientSecret String clientSecret;
  @Inject ApiService apiService;

  public AccountAuthenticator(Context context) {
    super(context);

TomMannson

[merge]
    tool = intellij

[mergetool "intellij"]
    cmd =  C:/Program\\ Files/Android/Android\\ Studio/bin/studio64.exe merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

[diff]
    tool = intellij

[difftool "intellij"]