equal
deleted
inserted
replaced
44 |
44 |
45 # The number of files to consider when performing the copy/rename |
45 # The number of files to consider when performing the copy/rename |
46 # detection; equivalent to the git diff option -l. |
46 # detection; equivalent to the git diff option -l. |
47 # renamelimit = 0 |
47 # renamelimit = 0 |
48 |
48 |
|
49 [merge] |
|
50 conflictstyle = diff3 |
|
51 |
49 [log] |
52 [log] |
50 date = iso |
53 date = iso |
51 |
54 |
52 [push] |
55 [push] |
53 # Push only current brunch. |
56 # Push only current brunch. |