File:Darcs-ag-conflict2.png
Jump to navigation
Jump to search
No higher resolution available.
Darcs-ag-conflict2.png (403 × 485 pixels, file size: 44 KB, MIME type: image/png)
|
This image (or all images in this category) uses inside labels or attached captions in a specific script or language and should be converted to a language neutral form. This would allow its use in all Wikimedia projects and, more importantly, all Wikimedia languages.
|
Summary
Understanding darcs - Patch theory example
Ganesh adds a conflicting patch. Here is how we resolve it
Licensing
I, the copyright holder of this work, hereby publish it under the following license:
This file is licensed under the Creative Commons Attribution-Share Alike 2.5 Generic license.
- You are free:
- to share – to copy, distribute and transmit the work
- to remix – to adapt the work
- Under the following conditions:
- attribution – You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
- share alike – If you remix, transform, or build upon the material, you must distribute your contributions under the same or compatible license as the original.
File history
Click on a date/time to view the file as it appeared at that time.
| Date/Time | Thumbnail | Dimensions | User | Comment | |
|---|---|---|---|---|---|
| current | 15:52, 14 November 2006 | | 403 × 485 (44 KB) | wikimediacommons>Kowey | rename shplist to s_list |
File usage
The following page uses this file:
