This is a file from the Wikimedia Commons

File:Darcs-ag-conflict.png

From Wikibooks, open books for an open world
Jump to navigation Jump to search

Darcs-ag-conflict.png ‎(403 × 453 pixels, file size: 36 KB, MIME type: image/png)

Summary

Description

Understanding darcs - Patch theory example

Ganesh adds a conflicting patch. Note that there is an SVG version of this file, but it looks terrible on my machine.
Date 3 March 2006 (original upload date)
Source No machine-readable source provided. Own work assumed (based on copyright claims).
Author No machine-readable author provided. Kowey assumed (based on copyright claims).

Licensing

I, the copyright holder of this work, hereby publish it under the following license:
w:en:Creative Commons
attribution share alike
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.

Captions

Add a one-line explanation of what this file represents

Items portrayed in this file

depicts

inception

3 March 2006

File history

Click on a date/time to view the file as it appeared at that time.

Date/TimeThumbnailDimensionsUserComment
current14:49, 14 November 2006Thumbnail for version as of 14:49, 14 November 2006403 × 453 (36 KB)KoweyRename shplst to s_list
11:46, 26 March 2006Thumbnail for version as of 11:46, 26 March 2006403 × 453 (34 KB)Kowey
10:58, 3 March 2006Thumbnail for version as of 10:58, 3 March 2006401 × 424 (31 KB)Kowey
10:09, 3 March 2006Thumbnail for version as of 10:09, 3 March 2006416 × 424 (31 KB)Kowey
00:58, 3 March 2006Thumbnail for version as of 00:58, 3 March 2006424 × 424 (33 KB)Kowey
00:50, 3 March 2006Thumbnail for version as of 00:50, 3 March 2006424 × 318 (28 KB)Kowey== Summary == Category:Darcs Category:Patch theory Understanding darcs - Patch theory example Ganesh adds a ''conflicting'' patch. Note that there is an SVG version of this file, but it looks terrible on my mach
Retrieved from "https://en.wikibooks.org/wiki/File:Darcs-ag-conflict.png"