Mercurial > hg > easyhg
changeset 536:5f04fa848f34
Add changelog
| author | Chris Cannam |
|---|---|
| date | Fri, 25 Nov 2011 09:34:55 +0000 |
| parents | 6b5da526bcd8 |
| children | a4e699d32a9a |
| files | CHANGELOG easyhg-merge.sh |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CHANGELOG Fri Nov 25 09:34:55 2011 +0000 @@ -0,0 +1,11 @@ +Changes in v1.1 since v1.0.1: + + * Closed branches are now supported: you can close a branch in EasyMercurial + and closed branches are truncated by default + * Bookmarks are now displayed, though you still cannot create them + * Fix excessive window size when very long URL or filename used + * Fix inconsistent state following a merge that results in no changes + * Improve server port detection when sharing repository + * Add help topic for merge + * Update program icon! +
--- a/easyhg-merge.sh Thu Nov 24 15:37:36 2011 +0000 +++ b/easyhg-merge.sh Fri Nov 25 09:34:55 2011 +0000 @@ -21,7 +21,7 @@ fi fi if [ -n "$exe" ]; then - exec "$exe" "$ancestor" "$left" "$right" --output "$out" --auto -L1 "`basename $left` (Common ancestor)" -L2 "$left (Your current version)" -L3 "`basename $left` (Version being merged)" + exec "$exe" --auto "$ancestor" "$left" "$right" --output "$out" --auto -L1 "`basename $left` (Common ancestor)" -L2 "$left (Your current version)" -L3 "`basename $left` (Version being merged)" fi done fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge