Mercurial > hgbook
comparison en/Makefile @ 115:b74102b56df5
Wow! Lots more work detailing the working directory, merging, etc.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 13 Nov 2006 16:19:48 -0800 |
parents | a0f57b3e677e |
children | 6b0f4498569e |
comparison
equal
deleted
inserted
replaced
114:ccff2b25478e | 115:b74102b56df5 |
---|---|
31 tour-merge-conflict.svg \ | 31 tour-merge-conflict.svg \ |
32 tour-merge-merge.svg \ | 32 tour-merge-merge.svg \ |
33 tour-merge-pull.svg \ | 33 tour-merge-pull.svg \ |
34 tour-merge-sep-repos.svg \ | 34 tour-merge-sep-repos.svg \ |
35 wdir.svg \ | 35 wdir.svg \ |
36 wdir-after-commit.svg | 36 wdir-after-commit.svg \ |
37 wdir-branch.svg \ | |
38 wdir-merge.svg \ | |
39 wdir-pre-branch.svg | |
37 | 40 |
38 image-svg := $(filter %.svg,$(image-sources)) | 41 image-svg := $(filter %.svg,$(image-sources)) |
39 | 42 |
40 example-sources := \ | 43 example-sources := \ |
41 daily.files \ | 44 daily.files \ |