comparison: .gitconfig
.gitconfig
- changeset 881
- a5b3b7b6850c
- parent 880
- 21a8fdcc9f38
- child 882
- e87f11edf6e0
equal
deleted
inserted
replaced
| 880:21a8fdcc9f38 | 881:a5b3b7b6850c |
|---|---|
| 39 | 39 |
| 40 [gpg] | 40 [gpg] |
| 41 program = "gpg2" | 41 program = "gpg2" |
| 42 | 42 |
| 43 [merge] | 43 [merge] |
| 44 tool = vimdiff2 | 44 tool = vimdiff3 |
| 45 guitool = gvimdiff | |
| 46 conflictstyle = diff3 | |
| 45 | 47 |
| 46 [branch] | 48 [branch] |
| 47 autosetuprebase = always | 49 autosetuprebase = always |
| 48 autosetupmerge = always | 50 autosetupmerge = always |
| 49 | 51 |
