annotate mercurial/repo.py @ 1772:b1a7fd503a29
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
author |
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
date |
Tue, 21 Feb 2006 15:48:16 -0600 |
parents |
142b5d5ec9cc |
children |
ffb895f16925 |
rev |
line source |
1089
|
1 # repo.py - repository base classes for mercurial
|
|
2 #
|
|
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
|
|
4 #
|
|
5 # This software may be used and distributed according to the terms
|
|
6 # of the GNU General Public License, incorporated herein by reference.
|
|
7
|
|
8 class RepoError(Exception): pass
|