@matheusbsbs / matheus-bagliano / commits / 19792b27da
Fork 0

Merge branch 'om/rerere-careful'

* om/rerere-careful: builtin-rerere: more carefully find conflict markers

Junio C Hamano committed Jul 14, 2008 at 23:47 UTC 19792b27da51bc52cfd08c7a17473b8a1f26d8a3

No changes.