From: David Kågedal <david@virtutech.com>
Date: Wed, 19 Dec 2007 18:00:11 +0000 (+0000)
Subject: Split git.merge into two functions
X-Git-Tag: v0.15-rc1~341
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/fab69eacedd180b5c67812336bfdb5f52f6a4ae5?hp=fab69eacedd180b5c67812336bfdb5f52f6a4ae5

Split git.merge into two functions

This only prepares for later simplifications.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---