It seems that `fossil changes` will show MERGED_WITH when you used
`fossil merge`, not when `fossil update` (to fix "would fork" error).
Anyway, after you have manually resolve conflicts, MERGED_WITH is
still shown, so it seems there is no way to know which files have
conflicts resolved, which files not.
By the way, here is my workaround to mark unresolved merge files:
% function fossil-changes {
fossil changes "$@" |
sed -r 's/EDITED(\s+)(.*)/grep -q "< BEGIN MERGE
CONFLICT:" "\2" \&\& echo "U\1\2" || echo "\0"/e'; }
% fossil-changes
U file1
% vi file1 # manually resolve conflicts
% fossil-changes
EDITED file1
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
