Mercurial > hg

comparison tests/test-merge9.t @ 21940:9209c02f1f25 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: report no argument warning using a hint With this change resolve and revert produce consistent output when run with no arguments: $ hg resolve abort: no files or directories specified (use --all to remerge all files) $ hg revert abort: no files or directories specified (use --all to revert all files)
author Nathan Goldbaum <ngoldbau@ucsc.edu>
date Thu, 24 Jul 2014 14:29:08 -0700
parents f2719b387380
children e635bc9bb7d9
comparison
equal deleted inserted replaced
21939:f486001f9d6f 21940:9209c02f1f25
74 U bar 74 U bar
75 R baz 75 R baz
76 76
77 resolve all warning 77 resolve all warning
78 $ hg resolve 78 $ hg resolve
79 abort: no files or directories specified; use --all to remerge all files 79 abort: no files or directories specified
80 (use --all to remerge all files)
80 [255] 81 [255]
81 82
82 resolve all 83 resolve all
83 $ hg resolve -a 84 $ hg resolve -a
84 merging bar 85 merging bar