rerere: only return whether a path has conflicts or not
authorThomas Gummerer <t.gummerer@gmail.com>
Sun, 5 Aug 2018 17:20:33 +0000 (18:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:22:35 +0000 (13:22 -0700)
commit221444f...d11a8fac84514447c2902430e237759c
tree02189a1...fe8fb7cb8925f55ad6b8fe17c13f3b9ccopy hash to clipboard (tree)
parent93406a2...2f404fd9f736e96ae27cc6e2e5eb3cf1copy hash to clipboard (diff)
rerere.c