git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-22 04:16:27 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
657071337f2155b24dea536bd0594de565cdc3a9
git/merge-recursive.c
Junio C Hamano ff8e25e99e Merge branch 'en/merge-cleanup-more' 
Further clean-up of merge-recursive machinery.

* en/merge-cleanup-more:
  merge-recursive: avoid showing conflicts with merge branch before HEAD
  merge-recursive: improve auto-merging messages with path collisions
2018-11-03 00:53:57 +09:00

105 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink