summaryrefslogtreecommitdiff
path: root/.html/media/dev/merging-structural-changes
ModeNameSize
-rw-r--r--_list.html1686logplain
-rw-r--r--ideal-merge-results.png87122logplain
-rw-r--r--index.html1686logplain
-rw-r--r--mercurial-merge-results.png99313logplain
-rw-r--r--subversion-merge-results.png114985logplain