16c47a3 ^
1 2 3 4 5 6 7 8 9 10 11 12
[color] diff = auto status = auto branch = auto [push] default = matching [init] defaultBranch = master [pull] rebase = false [merge] conflictStyle = diff3