fix disappearing symlinks [issue1509]

test-merge-tools: Don't use tac "tac" was a bad tool - is not available on all platforms. The test now only uses the "tools" true, false, head, echo, cat and /bin/cat

merge: mark kept local files as readded on linear update (issue539)

Use shutil.copystat in copyfile().

Update tcsh completion scripts with new commands and for new help output. Also make the build script executable.

resolve: accepts walkopts (-I and -X)

help: better formatting in "Date Formats" section

log-like commands now use -G for --graph, -g for --git

add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension.

i18n: add python-format comments to Japanese translation