diff tests/test-rename-merge1.t @ 44331:2527c10a2569 stable

shelve: add test clearly demonstrating that the conflict labels are backwards Differential Revision: https://phab.mercurial-scm.org/D8139
author Kyle Lippincott <spectral@google.com>
date Thu, 20 Feb 2020 17:06:01 -0800
parents ab416b5d9b91
children d7622fdec3b5
line wrap: on
line diff