Question about Source Control

[Dave Angel]

 Steven D'Aprano <steve+comp.lang.python at pearwood.info> Wrote in
 message:
> On Tue, 18 Mar 2014 19:08:17 +1100, Chris Angelico wrote:
> 
>> On Tue, Mar 18, 2014 at 6:55 PM, Steven D'Aprano <steve at pearwood.info>
>> wrote:
>>> I don't think that *version* control is the right model to describe
>>> what hg and git do, although it may be appropriate for subversion. hg
>>> doesn't manage *versions*, it manages changes to source code
>>> ("changesets").
>> 
>> Meh... Is there any real difference? 
> 
> If you believe Joel Spolsky, there is:
> 
> http://hginit.com/00.html
> 
> Scroll down about half way, to the section titled "One more big 
> conceptual difference".
> 
> Recording *snapshots* versus recording *diffs* makes a considerable 
> difference when it comes to dealing with merge conflicts.
> 

So which does git do, according to this model? 


-- 
DaveA