[issue536] hg merge: an option to ignore whitespace changes

[Antoine Pitrou]

New submission from Antoine Pitrou <antoine.pitrou at wengo.com>:

Hi,

it has happened that "hg merge" puts me in manual merge mode, but only because
of failure to merge some inoculous whitespace changes caused by my editor. It
would be nice if "hg merge" could grow the same options as "hg diff", namely
"-w", "-b" and "-B".

----------
messages: 2988
nosy: antoine
priority: feature
status: unread
title: hg merge: an option to ignore whitespace changes
topic: merge, ui

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