chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 1e07540)
Add the '--interactive' option to 'resolved'
authorCatalin Marinas <catalin.marinas@gmail.com>
Mon, 16 Oct 2006 18:36:49 +0000 (19:36 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 16 Oct 2006 18:36:49 +0000 (19:36 +0100)
This options causes the 'resolved' command to run an interactive merge tool
like xxdiff or emacs, defined by the 'imerger' variable in the .stgitrc
config file.

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

No differences found
GIT patch-maintenance porcelain (local modifications)