comparison tests/test-completion.t @ 46496:d57e607d9e33

diff: replace --merge option by config option

I can't think of any reason you'd want to enable the merge diff on a
run-to-run basis; you'd probably either always or never want it set
(though I can't see why you'd never want it set). If you have it set,
you'll probably also want the same output in `hg log -p`
output. Having a single config option for the feature makes sense.

Differential Revision: https://phab.mercurial-scm.org/D9956

46495:5aac1a1a5beb

  debugupgraderepo: optimize, run, backup, changelog, manifest, filelogs
  debugwalk: include, exclude
  debugwhyunstable: 
  debugwireargs: three, four, five, ssh, remotecmd, insecure
  debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
  diff: rev, from, to, change, merge, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
  export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
  files: rev, print0, include, exclude, template, subrepos
  forget: interactive, include, exclude, dry-run
  graft: rev, base, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run
  grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude

46496:d57e607d9e33

  debugupgraderepo: optimize, run, backup, changelog, manifest, filelogs
  debugwalk: include, exclude
  debugwhyunstable: 
  debugwireargs: three, four, five, ssh, remotecmd, insecure
  debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
  diff: rev, from, to, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
  export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
  files: rev, print0, include, exclude, template, subrepos
  forget: interactive, include, exclude, dry-run
  graft: rev, base, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run
  grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, all-files, user, date, template, include, exclude