@matheusbsbs / matheus-bagliano / commits / e036c90a91
Fork 0

Merge branch 'sb/merge-friendly'

* sb/merge-friendly: Display 'theirs' branch name when possible in merge. Use extended SHA1 syntax in merge-recursive conflicts.

Junio C Hamano committed Dec 24, 2006 at 02:18 UTC e036c90a913889dfa8097ebe73b619370e0c6f32

No changes.