By default, the index was left with two unmerged entries. StGIT tries to
leave the index clean after conflicts.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
return 1
# files are different
else:
return 1
# files are different
else:
+ # reset the index to the current file
+ os.system('git-update-index -- %s' % path)
print >> sys.stderr, \
'Error: File "%s" added in branches but different' % path
__conflict(path)
print >> sys.stderr, \
'Error: File "%s" added in branches but different' % path
__conflict(path)