Comment and done.

master
tschwinge 2010-06-09 13:47:35 +00:00 committed by Joey Hess
parent 651acf8b14
commit 4eb82e7d41
1 changed files with 16 additions and 0 deletions

View File

@ -187,3 +187,19 @@ intentional? Otherwise I could supply a patch.
> merge. As the file is then actually modified to resolve the merge
> I think it makes sense to count the merge as the last modification in
> that case. --[[Joey]]
>> That'd be reasonable, but `git log` will also show merges that are not
>> conflicting (as in my case).
>> Yet, I'm not totally disagreeing with your choice. With this `git
>> log` invocation, you're not able to tell from its output whether a
>> conflict was resolved or not.
>> Also, it's a bit like the *should we use the **author timestamp** or
>> **commit timestamp*** discussion. Your code will always use the
>> latest timestamp.
>> I guess I'll get my head wrapped around that, and it's fine, so this is
>> [[done]].
>> --[[tschwinge]]