Mercurial > hg > easyhg
log easyhg-merge.sh @ 737:4f3a8aa8d384 tip
age | author | description |
---|---|---|
2011-11-25 | Chris Cannam | Add changelog |
2011-07-07 | Chris Cannam | Look for easyhg-kdiff3 in preference to plain kdiff3 |
2011-04-13 | Chris Cannam | Try to make kdiff3 a bit clearer |
2011-03-11 | Chris Cannam | Merge fixes: primarily, handle failed merges better filelist_right_button_menu |
2011-02-21 | Chris Cannam | Return success if the external diff/merge _is_ found, not if it isn't! |
2011-02-10 | Chris Cannam | * Use kdiff3 from path if present; return sensible return code |
2011-01-20 | Chris Cannam | * Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists. base easyhg-merge-osx.sh@483db46bf40e |