##// 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:

r11769:ca6cebd8 stable
r32256:9bc36198 default
Show More
test-symlink-os-yes-fs-no.py.out
14 lines | 438 B | text/plain | TextLexer
/ tests / test-symlink-os-yes-fs-no.py.out
Dov Feldstern
test symlinks on symlink-capable os but non-capable filesystem (issue1149)...
r6879 requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Dov Feldstern
test symlinks on symlink-capable os but non-capable filesystem (issue1149)...
r6879 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Martin Geisler
dirstate: ignore symlinks when fs cannot handle them (issue1888)...
r11769 requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved