Jan Piotrowski janpio

## build-and-deploy.sh
#!/bin/bash
PROJECT_NAME=MyApp
SCHEME_NAME=MyApp
STARTTIME=$(date +%s);

set -e
set -x

### Install dependencies
echo "--- Install dependencies [Time Elapsed $(($(date +%s) - $STARTTIME))s]"

## .gitconfig
[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge
	#!/bin/bash
	PROJECT_NAME=MyApp
	SCHEME_NAME=MyApp
	STARTTIME=$(date +%s);

	set -e
	set -x

	### Install dependencies
	echo "--- Install dependencies [Time Elapsed $(($(date +%s) - $STARTTIME))s]"
	[mergetool]
	prompt = false
	keepBackup = false
	keepTemporaries = false

	[merge]
	tool = winmerge

	[mergetool "winmerge"]
	name = WinMerge