| commit | f7ed76a9b6158888e8efe2faef9c095802fd93fe | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 10 Jan 2007 19:38:26 +0000 (10 19:38 +0000) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Wed, 10 Jan 2007 19:38:26 +0000 (10 19:38 +0000) | ||
| tree | 7049d43d1148441bb132f28b0c986f889e2a64be | treesnapshot (tar.gz zip) |
| parent | 79df2f0df89f382b63e4122aa15099a257a06463 | commitdiff |
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>
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 | diffblobblamehistory | |
| stgit/commands/resolved.py | diffblobblamehistory | |
| stgit/config.py | diffblobblamehistory | |
| stgit/gitmergeonefile.py | diffblobblamehistory |