0 0 244 C

Fix another problem with rebasing updates against multiple remote changes.

FossilOrigin-Name: c8e7b5a061a3f2fbd9072530177b80f917b39ab5d7cd6acb0a221ab33e78a5cd

dan committed 8y ago

f231e18c6bd10c737fe0e16123bbd2877b8b4e88

Parent: 3fa5463