On Tue, Dec 18, 2018 at 03:34:20PM -0200, Adilson de Almeida Junior wrote:
> I guess, most times the second behavior is the expected: two conflict
> hunks, not only the divvergent pieces (this case, the second line) of
> them. By the doc:
>
> merge.conflictStyle
>
> Specify the style in whic
Hi,
I´m not sure if this is a bug or not.
These are the steps to reproduce it (git 2.17 at least):
- In a repo, with default settings (merge strategy, conflict style,
merge drivers, etc);
- Create a file 'test.xml', and add the following content to it:
[div]
A
[/div]
- Perform a git add and g
2 matches
Mail list logo
