builtin/apply: make add_conflicted_stages_file() return -1 on error
authorChristian Couder <christian.couder@gmail.com>
Mon, 8 Aug 2016 21:03:18 +0000 (23:03 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2016 19:41:47 +0000 (12:41 -0700)
commita902edc...ebd0a25a307163f050326bda8f494204
tree8769abd...0e4cc3e0d8cf9605c6976771be1c6c52copy hash to clipboard (tree)
parent6e8df31...692105e7d3e69f548440e4b817bf3211copy hash to clipboard (diff)
builtin/apply.c