sjl / splice.vim

A Vim plugin for managing three-way merges.
MIT License
235 stars 21 forks source link

can't view Two and Result in diff mode #5

Closed vlmarek closed 11 years ago

vlmarek commented 12 years ago

Sorry, I did no investigation so far, it would be interesting to see if you can reproduce it.

This script reproduces it for me:

set -x
rm -rf a b
hg init a                                                                                                                                                     
cd a                                                                                                                                                          
echo a > a                                                                                                                                                    
hg ci -A -m a                                                                                                                                                 
cd ..                                                                                                                                                         
hg clone a b                                                                                                                                                  
cd a                                                                                                                                                          
echo b >> a                                                                                                                                                   
hg ci -A -m a                                                                                                                                                 
cd ../b                                                                                                                                                       
echo c >> a                                                                                                                                                   
hg ci -A -m b                                                                                                                                                 
hg pull --rebase

I would suppose to see One (left) and Result (right).

Thank you

Vlad

sjl commented 11 years ago

If by "diff mode" you mean "compare view", I think I just fixed this.

vlmarek commented 11 years ago

Indeed, that fixed the issue!

Thank you