Add option to automatically invoke the interactive merger
commitf7ed76a9b6158888e8efe2faef9c095802fd93fe
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Jan 2007 19:38:26 +0000 (10 19:38 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 10 Jan 2007 19:38:26 +0000 (10 19:38 +0000)
tree7049d43d1148441bb132f28b0c986f889e2a64be
parent79df2f0df89f382b63e4122aa15099a257a06463
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>
examples/gitconfig
stgit/commands/resolved.py
stgit/config.py
stgit/gitmergeonefile.py