##// END OF EJS Templates
debugcommands: add debugpickmergetool to examine which merge tool is chosen...
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.

File last commit:

r5688:883d887c default
r32256:9bc36198 default
Show More
test-dispatch.py.out
23 lines | 481 B | text/plain | TextLexer
/ tests / test-dispatch.py.out
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 running: init test1
result: None
running: add foo
Patrick Mezard
commands: add exits(1) if a specified file cannot be added (issue 891)
r5688 result: 0
Thomas Arendsen Hein
Added test for commands.dispatch (especially 88803a69b24)
r5095 running: commit -m commit1 -d 2000-01-01 foo
result: None
running: commit -m commit2 -d 2000-01-02 foo
result: None
running: log -r 0
changeset: 0:0e4634943879
user: test
date: Sat Jan 01 00:00:00 2000 +0000
summary: commit1
result: None
running: log -r tip
changeset: 1:45589e459b2e
tag: tip
user: test
date: Sun Jan 02 00:00:00 2000 +0000
summary: commit2
result: None