These are chat archives for Cardiff-University-Code-Academy/WBS

20th
Apr 2015
DJ
@djdavies
Apr 20 2015 10:49
@StyleASD what's your trello email account?
Aled Davies
@StyleASD
Apr 20 2015 10:51
StyleASD
same as my github
DJ
@djdavies
Apr 20 2015 11:11
No results

`[merge]
tool = diffmerge

[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = "C:/PROGRA~1/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\""
prompt = false

[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = "C:/PROGRA~1/SourceGear/Common/DiffMerge/sgdm.exe --merge --result=$MERGED $LOCAL $BASE $REMOTE"
trustExitCode = false
keepBackup = false`

@StyleASD remeove the backticks at the start/end - cheers