commit | f9d72413bcbf33ced45f12e17ef156abd73963f6 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <junkio@cox.net> | Sun Oct 02 11:13:44 2005 -0700 |
committer | Junio C Hamano <junkio@cox.net> | Sun Oct 02 11:13:44 2005 -0700 |
tree | 86dba3737d5e0b583d7438c927db9e95b632ab68 | |
parent | 23822a355de674f1d1321ad7e112f0fe40124aca [diff] |
Handle really trivial case inside git-merge. 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>