comparison tests/test-debugcomplete.t @ 12810:a68ccfd9c7be stable

backout: add --tool argument for specifying merge tool
author Steve Borho <steve@borho.org>
date Fri, 22 Oct 2010 11:58:43 -0500
parents 05bd2658bbb3
children 15ca4bfecfe3
comparison
equal deleted inserted replaced
12809:e5922564ab01 12810:a68ccfd9c7be
194 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos 194 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
195 summary: remote 195 summary: remote
196 update: clean, check, date, rev 196 update: clean, check, date, rev
197 addremove: similarity, include, exclude, dry-run 197 addremove: similarity, include, exclude, dry-run
198 archive: no-decode, prefix, rev, type, subrepos, include, exclude 198 archive: no-decode, prefix, rev, type, subrepos, include, exclude
199 backout: merge, parent, rev, include, exclude, message, logfile, date, user 199 backout: merge, parent, tool, rev, include, exclude, message, logfile, date, user
200 bisect: reset, good, bad, skip, command, noupdate 200 bisect: reset, good, bad, skip, command, noupdate
201 branch: force, clean 201 branch: force, clean
202 branches: active, closed 202 branches: active, closed
203 bundle: force, rev, branch, base, all, type, ssh, remotecmd 203 bundle: force, rev, branch, base, all, type, ssh, remotecmd
204 cat: output, rev, decode, include, exclude 204 cat: output, rev, decode, include, exclude