Mercurial > hg
comparison tests/test-completion.t @ 32256:9bc36198338e
debugcommands: add debugpickmergetool to examine which merge tool is chosen
Before this patch, there is no convenient way to know which merge tool
is chosen for each managed files without actual merging.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 13 May 2017 03:37:50 +0900 |
| parents | 2406dbba49bd |
| children | ccef71de7d41 |
comparison
equal
deleted
inserted
replaced
| 32255:7e35d31b41fd | 32256:9bc36198338e |
|---|---|
| 97 debuglocks | 97 debuglocks |
| 98 debugmergestate | 98 debugmergestate |
| 99 debugnamecomplete | 99 debugnamecomplete |
| 100 debugobsolete | 100 debugobsolete |
| 101 debugpathcomplete | 101 debugpathcomplete |
| 102 debugpickmergetool | |
| 102 debugpushkey | 103 debugpushkey |
| 103 debugpvec | 104 debugpvec |
| 104 debugrebuilddirstate | 105 debugrebuilddirstate |
| 105 debugrebuildfncache | 106 debugrebuildfncache |
| 106 debugrename | 107 debugrename |
| 270 debuglocks: force-lock, force-wlock | 271 debuglocks: force-lock, force-wlock |
| 271 debugmergestate: | 272 debugmergestate: |
| 272 debugnamecomplete: | 273 debugnamecomplete: |
| 273 debugobsolete: flags, record-parents, rev, index, delete, date, user, template | 274 debugobsolete: flags, record-parents, rev, index, delete, date, user, template |
| 274 debugpathcomplete: full, normal, added, removed | 275 debugpathcomplete: full, normal, added, removed |
| 276 debugpickmergetool: rev, changedelete, include, exclude, tool | |
| 275 debugpushkey: | 277 debugpushkey: |
| 276 debugpvec: | 278 debugpvec: |
| 277 debugrebuilddirstate: rev, minimal | 279 debugrebuilddirstate: rev, minimal |
| 278 debugrebuildfncache: | 280 debugrebuildfncache: |
| 279 debugrename: rev | 281 debugrename: rev |