merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/test-sigchain.c b/test-sigchain.c
index 8747deac627d5e3d57cd1f072f34802d29efa25e..42db234e871908514814c9b8dc50cc65d9b093cd 100644 (file)
--- a/test-sigchain.c
+++ b/test-sigchain.c
@@ -14,9 +14,9 @@ X(three)
 #undef X
 
 int main(int argc, char **argv) {
-       sigchain_push(SIGINT, one);
-       sigchain_push(SIGINT, two);
-       sigchain_push(SIGINT, three);
-       raise(SIGINT);
+       sigchain_push(SIGTERM, one);
+       sigchain_push(SIGTERM, two);
+       sigchain_push(SIGTERM, three);
+       raise(SIGTERM);
        return 0;
 }