~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1fece88) | patch
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)
commit1e0754060c4fbf7a35efc8557e8d798a49103324
tree5443903e08a2ae4ee5eb460d92599213bc000132tree | snapshot (tar.gz zip)
parent1fece88ef919ba160673e65488d4867c6d49dda7commit | diff
Add the '--interactive' option to 'resolved'

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>
TODO diff | blob | blame | history
examples/stgitrc diff | blob | blame | history
stgit/commands/resolved.py diff | blob | blame | history
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)