From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sun, 18 Sep 2005 08:02:37 +0000 (+0100)
Subject: Specify a different base for the imported patch
X-Git-Tag: v0.7~18
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/35344f865c199e8457d951bc51b45d21f813cbc2?ds=inline;hp=35344f865c199e8457d951bc51b45d21f813cbc2

Specify a different base for the imported patch

This option will import a patch on a different base and perform a three-way
merge with the current HEAD.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---