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

Merge branch 'maint'

* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.

Junio C Hamano committed Apr 19, 2006 at 15:41 UTC b8950769b8b91d634ec549fd1af792ccc1864f79

No changes.