- add diff3 merge support. Locally modified files are merged with upstream changes
authorDr. Peter Poeml <poeml@cmdline.net>
Mon, 22 May 2006 14:12:06 +0000 (14:12 +0000)
committerDr. Peter Poeml <poeml@cmdline.net>
Mon, 22 May 2006 14:12:06 +0000 (14:12 +0000)
commit211b197b26320b4b3147cfbd8a65f29798947d16
tree386799f985b1d40f0a0bbecbe7086ebeef994215
parent2c37f7287de128051142403aa7140cc332d7396f
- add diff3 merge support. Locally modified files are merged with upstream changes
  if possible, and go into Conflict state if that fails.
- add 'resolved' command to be used after manual merging.
NEWS
README
TODO
osc/commandline.py
osc/core.py