From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Jul 2008 06:47:14 +0000 (-0700)
Subject: Merge branch 'om/rerere-careful'
X-Git-Tag: v1.6.0-rc0~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19792b27da51bc52cfd08c7a17473b8a1f26d8a3;p=git.git

Merge branch 'om/rerere-careful'

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

19792b27da51bc52cfd08c7a17473b8a1f26d8a3