Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision | Next revisionBoth sides next revision | ||
lirec:version_control_guide [2009-02-04 18:38] – davegriffiths | lirec:version_control_guide [2009-02-04 18:41] – davegriffiths | ||
---|---|---|---|
Line 112: | Line 112: | ||
</ | </ | ||
- | You can then choose which line to use. | + | You can then choose which line to use, save and commit the change. |
====Diffing==== | ====Diffing==== |