fix copy&paste issue in clear_from_conflictlist(): write the conflict list, not the...
authorDr. Peter Poeml <poeml@cmdline.net>
Tue, 23 May 2006 13:59:29 +0000 (13:59 +0000)
committerDr. Peter Poeml <poeml@cmdline.net>
Tue, 23 May 2006 13:59:29 +0000 (13:59 +0000)
commitf0c9a1c3f4cb7538cd01553f98e6a1f5790812fb
treeadb7f624497610983245faaad398cd26101b0e92
parentaa36c25505c04c0ce026ee8977591ef303b6f0d4
fix copy&paste issue in clear_from_conflictlist(): write the conflict list, not the delete list
osc/core.py