commit - e5eb6d2d0fae51188a4650e49d0ad3866d3f3fb5
commit + cd2a3010322415cd187fe81189a32e49cac09672
blob - a2ea4918346e2f063a2003d0c7d0bcbabf8cb44c
blob + 7d5a96f1e25c03524fa8a665ef333fcf3a43fa8f
--- TODO
+++ TODO
@@ -27,6 +27,11 @@ got:
 - enforce that log messages are encoded in either ASCII or UTF-8; this
   mostly matters for -portable since OpenBSD doesn't provide other locales
 - by default, deny rebasing of commits that exist in refs/remotes or refs/tags
+- allow rebase to detect changes already present in the new base branch by
+  comparing the IDs of base-blobs of changed files on either side, and then
+  removing detected no-op changes from the list of commits to rebase before
+  merging any changes (rather than letting diff3 figure this out). RCS IDs
+  in commits exported from CVS will need to be elided to avoid false positives.
 
 tog:
 - make 'tog log' respond to key presses while 'loading...' history; loading