view tests/test-issue1089.out @ 11237:feb2a58fc592 stable

record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 31 May 2010 17:13:15 +0900
parents 2268edff1bec
children
line wrap: on
line source

adding a/b
removing a/b
adding a/b
removing a/b