[PATCH 2 of 3 mergedriver V4] test-resolve.t: remove completely unnecessary line
Siddharth Agarwal
sid0 at fb.com
Thu Nov 19 07:45:23 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447918952 28800
# Wed Nov 18 23:42:32 2015 -0800
# Node ID f80b12a9b9ce8136040eecc1c1f07231550ee6a7
# Parent 59604adedebf578e4c6a5e112dc7cb3e26587446
# Available At http://42.netv6.net/sid0-wip/hg/
# hg pull http://42.netv6.net/sid0-wip/hg/ -r f80b12a9b9ce
test-resolve.t: remove completely unnecessary line
I have no idea what I was thinking when I wrote this.
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -221,7 +221,6 @@ resolve <file> should re-merge file
test .orig behavior with resolve
- $ echo resolve > file
$ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig'
*/file1~base*: (glob)
>>>
More information about the Mercurial-devel
mailing list