view tests/test-status-inprocess.py.out @ 32313:a580b2d65ded

rebase: make sure merge state is cleaned up for no-op rebases (issue5494) If a rebase ends up doing a no-op commit, make sure the merge state is still cleaned up.
author Jeremy Fitzhardinge <jsgf@fb.com>
date Thu, 18 May 2017 13:18:05 -0700
parents 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py