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)
commita1b32fd...3d1d05395f186bfa06e92174519dab8d
tree5ba298a...acd597fce76562b6b0ff23b22c03c52fcopy hash to clipboard (tree)
parent9022a49...a3c407859560d4ac4a278c0d6ad58837copy hash to clipboard (diff)
builtin-rerere.c