log tests/test-conflict.t @ 44115:e1b8b4e4f496

age author description
Mon, 09 Dec 2019 22:24:58 -0800 Rodrigo Damazio Bovendorp status: outputting structured unfinished-operation information
Mon, 09 Dec 2019 22:06:55 -0800 Rodrigo Damazio Bovendorp status: add template/json data about whether a file has unresolved conflicts
Sat, 15 Sep 2018 21:35:36 +0900 Yuya Nishihara status: remove "morestatus" message from formatter data (BC)