~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allows extraction of information about remotes.
[stgit]
/
stgit
/
gitmergeonefile.py
diff --git
a/stgit/gitmergeonefile.py
b/stgit/gitmergeonefile.py
index
587c8c4
..
b9d02aa
100644
(file)
--- a/
stgit/gitmergeonefile.py
+++ b/
stgit/gitmergeonefile.py
@@
-102,9
+102,8
@@
def interactive_merge(filename):
"""Run the interactive merger on the given file. Note that the
index should not have any conflicts.
"""
"""Run the interactive merger on the given file. Note that the
index should not have any conflicts.
"""
- try:
- imerger = config.get('stgit', 'imerger')
- except Exception, err:
+ imerger = config.get('stgit.imerger')
+ if not imerger:
raise GitMergeException, 'Configuration error: %s' % err
extensions = file_extensions()
raise GitMergeException, 'Configuration error: %s' % err
extensions = file_extensions()
@@
-185,7
+184,7
@@
def merge(orig_hash, file1_hash, file2_hash,
os.system('git-update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, path))
os.system('git-update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, path))
- if config.get('stgit
', '
autoimerge') == 'yes':
+ if config.get('stgit
.
autoimerge') == 'yes':
print >> sys.stderr, \
'Trying the interactive merge'
try:
print >> sys.stderr, \
'Trying the interactive merge'
try: