[issue440] merge-in-progress should allow viewing diffs

[Giorgos Keramidas]

New submission from Giorgos Keramidas <keramida at freebsd.org>:

While merging files which have been either (a) changed in the local branch, but
removed in the remote branch, or (b) removed in the local branch, but modified
in the remote branch, "hg merge" prints one of:

% remote changed a/a which local deleted
% (k)eep or (d)elete?

%  local changed a/a which remote deleted
% (k)eep or (d)elete?

But since there is no way to see the actual change it's some times difficult to
judge if the file should be kept or deleted.

----------
messages: 2486
nosy: keramida
priority: feature
status: unread
title: merge-in-progress should allow viewing diffs

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue440>
____________________________________________________