projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9022a49) | patch
git-rerere: detect unparsable conflicts
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 07:21:28 +0000 (00:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 07:54:40 +0000 (00:54 -0700)
commita1b32fdc3d1d05395f186bfa06e92174519dab8d
tree5ba298aaacd597fce76562b6b0ff23b22c03c52ftree | snapshot
parent9022a495a3c407859560d4ac4a278c0d6ad58837commit | diff
git-rerere: detect unparsable conflicts

rerere did not detect the case where <<< === >>> markers did not match.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-rerere.c diff | blob | history
Git—the stupid content tracker