From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 10 Jan 2007 19:38:26 +0000 (+0000)
Subject: Add option to automatically invoke the interactive merger
X-Git-Tag: v0.12~36
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/f7ed76a9b6158888e8efe2faef9c095802fd93fe?hp=f7ed76a9b6158888e8efe2faef9c095802fd93fe

Add option to automatically invoke the interactive merger

The 'autoimerge' option was added (defaulting to 'no') to
automatically invoke the interactive merging tool when a conflict
occurs.

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