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

Merge branch 'tr/maint-merge-ours-clarification' (early part)

* 'tr/maint-merge-ours-clarification' (early part): rebase docs: clarify --merge and --strategy Documentation: clarify 'ours' merge strategy

Junio C Hamano committed Nov 22, 2009 at 16:28 UTC c50230f75109677d7adf0bd94f99d17f35a519a6

No changes.