Revision f9d72413bcbf33ced45f12e17ef156abd73963f6 authored by Junio C Hamano on 02 October 2005, 18:13:44 UTC, committed by Junio C Hamano on 02 October 2005, 18:13:44 UTC
Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 23822a3
| File | Mode | Size |
|---|---|---|
| sha1.c | -rw-r--r-- | 1.8 KB |
| sha1.h | -rw-r--r-- | 402 bytes |
| sha1_arm.S | -rw-r--r-- | 3.5 KB |
Computing file changes ...
