Merge branch 'om/rerere-careful'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:47:14 +0000 (23:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 06:47:14 +0000 (23:47 -0700)
commit19792b27da51bc52cfd08c7a17473b8a1f26d8a3
tree2cd6ca572e00dda2d3813cf745984a7adf464663
parentb773fc34a0425790db7fe7c6a2d02d742ff41081
parent99d698f1e703754422f1dd780487ddbff3726dc3
Merge branch 'om/rerere-careful'

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