log tests/test-conflict.t @ 39736:e7ae31199ff9

age author description
Sat, 15 Sep 2018 21:28:47 +0900 Yuya Nishihara tests: show that the structure of the more status output looks weird
Tue, 18 Sep 2018 23:47:21 -0400 Matt Harbison tests: quote PYTHON usage
Thu, 09 Aug 2018 12:32:11 +0300 Pulkit Goyal status: advertise --abort instead of 'update -C .' to abort a merge