Add conflicted output which indicates whether merge conflicts found or not#269
Closed
ken-matsui wants to merge 1 commit intochinthakagodawita:masterfrom ken-matsui:add-output-for-merge-conflict
+40-13
