projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b773fc3 99d698f)
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)
* om/rerere-careful:
  builtin-rerere: more carefully find conflict markers


Trivial merge
Git—the stupid content tracker