diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-22 00:21:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-22 00:54:40 -0700 |
| commit | a1b32fdc3d1d05395f186bfa06e92174519dab8d (patch) | |
| tree | 5ba298aaacd597fce76562b6b0ff23b22c03c52f /compat | |
| parent | rerere: rerere_created_at() and has_resolution() abstraction (diff) | |
| download | tgif-a1b32fdc3d1d05395f186bfa06e92174519dab8d.tar.xz | |
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>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions