Mercurial > hg > easyhg
log easyhg-merge.sh @ 596:abfef4acceca easyhg_v1.2.1
| age | author | description |
|---|---|---|
| Fri, 25 Nov 2011 09:34:55 +0000 | Chris Cannam | Add changelog |
| Thu, 07 Jul 2011 10:59:50 +0100 | Chris Cannam | Look for easyhg-kdiff3 in preference to plain kdiff3 |
| Wed, 13 Apr 2011 17:09:57 +0100 | Chris Cannam | Try to make kdiff3 a bit clearer |
| Fri, 11 Mar 2011 18:08:22 +0000 | Chris Cannam | Merge fixes: primarily, handle failed merges better filelist_right_button_menu |
| Mon, 21 Feb 2011 18:16:15 +0000 | Chris Cannam | Return success if the external diff/merge _is_ found, not if it isn't! |
| Thu, 10 Feb 2011 18:49:01 +0000 | Chris Cannam | * Use kdiff3 from path if present; return sensible return code |
| Thu, 20 Jan 2011 13:37:00 +0000 | 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 |