comparison tests/test-evolve-templates.t @ 4293:d4902d48d095

split: add a option to discard remaining change during split This is useful to drop unwanted remaining change spotted during the split.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 20 Feb 2018 09:35:16 +0100
parents caaa89adf3eb
children 8974a05a49fa
comparison
equal deleted inserted replaced
4292:caaa89adf3eb 4293:d4902d48d095
290 diff --git a/b b/b 290 diff --git a/b b/b
291 new file mode 100644 291 new file mode 100644
292 examine changes to 'b'? [Ynesfdaq?] n 292 examine changes to 'b'? [Ynesfdaq?] n
293 293
294 created new head 294 created new head
295 Done splitting? [yNq?] n 295 Done splitting? [yNdq?] n
296 diff --git a/b b/b 296 diff --git a/b b/b
297 new file mode 100644 297 new file mode 100644
298 examine changes to 'b'? [Ynesfdaq?] y 298 examine changes to 'b'? [Ynesfdaq?] y
299 299
300 @@ -0,0 +1,1 @@ 300 @@ -0,0 +1,1 @@