ZachJiroun

__author__ = 'zachj'

import requests
import json

merchantId = 'INSERT YOUR MERCHANT ID HERE'
token = 'INSERT YOUR API TOKEN HERE'
apiToken = '?access_token=' + token
baseURL = 'https://api.clover.com/v3/merchants/' + merchantId + '/'
headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}

vratiu

#  Customize BASH PS1 prompt to show current GIT repository and branch.
#  by Mike Stewart - http://MediaDoneRight.com

#  SETUP CONSTANTS
#  Bunch-o-predefined colors.  Makes reading code easier than escape sequences.
#  I don't remember where I found this.  o_O

# Reset
Color_Off="\[\033[0m\]"       # Text Reset

AbraaoAlves

Passos:

1. Copie e cole o conteudo do .gitconfig(2012/2013) para o arquivo locallizado no C:\Users<SeuUserName>\
2. Agora é só esperar algum conflito, seja de merge ou rebase, e usar a linha de comando a seguir:

git mergetool

O git irá identificar o vsdiffmerge como ferramenta padrão de resolução de conflitos e abrirá o vs2012/2013 somente com os arquivos com problemas de merge. Assim:

badsyntax

#!/usr/bin/env bash
#
# Approach:
# 1. Find variable declaration in the form of "$my-var: anyvalue"
# 2. Loop through found variables and find occurrences of each variable in all sass files
# 3. Filter out vars that occurred only once

if [ -z "$1" ]; then
	echo "Please specify a directory as the first argument."
	exit 1

shawndumas

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge