Thus said Ron W on Fri, 20 Mar 2015 15:56:51 -0400: > I've never seen a non-gui, interactive merge, so I don't know how > feasible to create such a tool
Here's a non-gui, interactive merge (I didn't show it, but there is also an edit command which invokes $EDITOR on just the chunk in question to allow you to correct for overlaps such as the one for ``line 3'': $ fossil settings gdiff-command idiff $ fossil stash gdif CHANGED file 3c3,4 < line 3 --- > Line 3 > Line 4 ? < 7c8 < Lin3 8 --- > Line 8 ? > idiff output in file idiff.out $ cp idiff.out file $ fossil diff Index: file ================================================================== --- file +++ file @@ -2,8 +2,8 @@ Line 2 line 3 Line 5 Line 6 Line 7 -Lin3 8 +Line 8 Line 9 Line 10 $ fossil ci -m done New_Version: 4939f3582aa15aa4739b713b232c8feeb34cbc8b Andy -- TAI64 timestamp: 40000000550cc043 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
