##// END OF EJS Templates
filemerge: add a 'leave unresolved' option to regular prompts...
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.

File last commit:

r25660:328739ea default
r27162:4ab69be0 default
Show More
readlink.py
13 lines | 245 B | text/x-python | PythonLexer
Thomas Arendsen Hein
Use common readlink.py instead of own implementations per test script.
r5683 #!/usr/bin/env python
import errno, os, sys
for f in sys.argv[1:]:
try:
print f, '->', os.readlink(f)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except OSError as err:
Matt Mackall
many, many trivial check-code fixups
r10282 if err.errno != errno.EINVAL:
raise
Thomas Arendsen Hein
Use common readlink.py instead of own implementations per test script.
r5683 print f, 'not a symlink'
sys.exit(0)