You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This reflects the merge conflict resolutions with the previous merge
commit as rebased from Git for Windows' `master` on top of upstream.
Once the conflicting patch series make it to an official Git version,
Git for Windows' `master` will need to take these merge conflict
resolutions in a more permanent way.
Signed-off-by: Johannes Schindelin <[email protected]>
0 commit comments