t / t4018 / cpp-skip-access-specifierson commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1class RIGHT : public Baseclass
   2{
   3public:
   4protected:
   5private:
   6        void DoSomething();
   7        int ChangeMe;
   8};