Hi,
On Thu, 11 Jan 2007, Johannes Sixt wrote:
This works: The tools that you commonly need to work on a local repo,
except merges ([*]): commit, rebase, reset, log, diff and their
plumbing.
[...]
[*] because shell scripts like merge-one-file can't be invoked from an
exe like merge-index, yet. Fortunately this looks like the easiest part
to solve.
Exactly. Just build-in merge-one-file. This has the further benefit that
we (finally) can use the inbuilt xdl_merge() without a fork()!
And then, we'll get Alex' merge under 1 minute.
Ciao,
Dscho