# HG changeset patch
# User Chris Cannam
# Date 1322213695 0
# Node ID 5f04fa848f34dfff45d8d811f4ecdf0ba5b7e037
# Parent  6b5da526bcd82f8f1bbc075e6f0b8d2ce23f68a3
Add changelog

diff -r 6b5da526bcd8 -r 5f04fa848f34 CHANGELOG
--- /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!
+
diff -r 6b5da526bcd8 -r 5f04fa848f34 easyhg-merge.sh
--- 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