git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d582ea2 4f44545)
Merge branch 'en/merge-cleanup-more'
authorJunio C Hamano <redacted>
Fri, 2 Nov 2018 15:53:57 +0000 (00:53 +0900)
committerJunio C Hamano <redacted>
Fri, 2 Nov 2018 15:53:57 +0000 (00:53 +0900)
commitff8e25e99e46b0425990d48c2f1d964a68fc3908
tree62d6454400d597237497adef73d307cdde7a0ebftree | snapshot
parentd582ea202b626dcc6c3b01e1e11a296d9badd730commit | diff
parent4f445453136b8c3575bc4d4c45fc9b7930688a5ccommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT