diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-03 20:06:33 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2013-01-03 20:55:30 -0500 |
| commit | 0fb4cb644d9408e44f4c5ab30a60700b0418f120 (patch) | |
| tree | 627ef4abedbbce25d0f8eef585bb525ee9ea42ff /wiki | |
| parent | 074759948e4a015d90278966b50e2b216abfc4f0 (diff) | |
Those scripts have long since vanished.
Diffstat (limited to 'wiki')
| -rw-r--r-- | wiki/dev/merging-structural-changes.md | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/wiki/dev/merging-structural-changes.md b/wiki/dev/merging-structural-changes.md index e1a7c1e..0c3970f 100644 --- a/wiki/dev/merging-structural-changes.md +++ b/wiki/dev/merging-structural-changes.md @@ -76,11 +76,3 @@ diagram above shows how [Mercurial](http://www.selenic.com/mercurial/) handles the same two tests. Since its changeset language does include an "object moved" primitive, it's able to take a content change for `dir-a/file` and apply it to `dir-b/file` if appropriate. - -## Further Resources - -If you feel like reproducing this yourself, or want to adapt my test scripts -to work with your favourite version control system, the scripts are -[available](http://alchemy.grimoire.ca/hg/tree-conflicts) from Mercurial or as -a [zip](http://alchemy.grimoire.ca/hg/tree-conflicts/archive/tip.zip). Patches -and suggestions welcome. |