saret/ChocolateyPackages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
205 Commits 2 Branches 0 Tags
e014a6ba28f7363cbbf0e89a0915196966e73abf
Commit Graph

3 Commits

Author SHA1 Message Date
Ethan J. Brown
e014a6ba28 fix (GitConfiguration): Mine / Theirs reversed for DiffMerge 2013-08-22 18:35:27 -07:00
Iristyle
15d736fd51 fix(EthanBrown.GitConfiguration): DiffMerge title 
- Mine / Theirs was reversed
 2013-04-03 12:57:14 -04:00
Iristyle
3e9c281e7b EthanBrown.GitConfiguration 
- A number of "standard" Git config options on Win
    core.autocrlf       true
    core.safecrlf       false
    rebase.autosquash   true
    help.format         html
    push.default        simple
    core.editor         Notepad++

    diff.tool           DiffMerge
    diff.guitool        DiffMerge
    merge.tool          DiffMerge
 2013-03-12 18:05:22 -04:00