log tests/test-merge-subrepos.t @ 46226:0826d684a1b5

age author description
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Sat, 15 Dec 2018 17:52:14 +0900 Yuya Nishihara tests: filter out uninteresting log events
Sun, 26 Aug 2018 19:14:26 +0300 Pulkit Goyal filemerge: fix the wrong placements of messages in prompt
Sat, 25 Aug 2018 21:17:34 +0300 Pulkit Goyal filemerge: print the filename in quotes in prompt
Mon, 20 Aug 2018 13:29:48 -0400 Augie Fackler merge: improve interactive one-changed one-deleted message (issue5550)
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches