osc update: fix diff3 merging for expanded links, by adding the revision to the
authorDr. Peter Poeml <poeml@cmdline.net>
Wed, 26 Mar 2008 16:11:11 +0000 (16:11 +0000)
committerDr. Peter Poeml <poeml@cmdline.net>
Wed, 26 Mar 2008 16:11:11 +0000 (16:11 +0000)
commita0bae2ab52fbf9186028c6b2860ec03753e702ef
tree4d30da8f5406688b118b545d0d84ba681a4eb3f4
parentab76e2cf8468dd8eeca933ba8678d583ed75f991
osc update: fix diff3 merging for expanded links, by adding the revision to the
get_source_file() call in the mergfile method.
osc/core.py