diff options
| author | Owen Jacobson <owen.jacobson@grimoire.ca> | 2015-07-17 01:30:44 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen.jacobson@grimoire.ca> | 2015-07-17 01:32:37 -0400 |
| commit | 79a5ee985199c7b12392ef168a042309b6fa4e29 (patch) | |
| tree | 97236a7f25480cb6a2f5b441cb370e1fa7b61b76 /wiki/dev/merging-structural-changes.md | |
| parent | 76aed6ef732de38d82245b3d674f70bab30221e5 (diff) | |
Fixup image links for Dokku-based version of site.
Diffstat (limited to 'wiki/dev/merging-structural-changes.md')
| -rw-r--r-- | wiki/dev/merging-structural-changes.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiki/dev/merging-structural-changes.md b/wiki/dev/merging-structural-changes.md index a47fdcc..d1c7a9c 100644 --- a/wiki/dev/merging-structural-changes.md +++ b/wiki/dev/merging-structural-changes.md @@ -17,7 +17,7 @@ changes when merging structural changes to the same files. ## The Preferred Outcome  +merge.](/media/dev/merging-structural-changes/ideal-merge-results.png) The diagram above shows a very simple source tree with one directory, `dir-a`, containing one file with two lines in it. On one branch, the file is modified @@ -31,7 +31,7 @@ merging. ## Subversion  +change.](/media/dev/merging-structural-changes/subversion-merge-results.png) There are two merge scenarios in this diagram, with almost the same outcome. On the left, a working copy of the branch where the file's content changed is @@ -69,7 +69,7 @@ ignoring changes. ## Mercurial  +change.](/media/dev/merging-structural-changes/mercurial-merge-results.png) Interestingly, there are tools which get this merge scenario right: the diagram above shows how [Mercurial](http://www.selenic.com/mercurial/) handles |