averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-23 12:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0aa9d8aa6ce429f0fa04e1ca819ed766c211e242
git-mirror/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