Hello,
is there some way to use vimdiff or a gui tool like meld for merging?
I always end up with the automerged file after update that I have to
edit by hand and that easily becomes messy on bigger changes. I am
used to perforce 3-way merge or the .THIS, .OTHER, .BASE files in
bazaar. The only way I can think of is making a second checkout and
then diffing against my repo with changes.
Am I missing something here?
Petr
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
