2 Commits

Author	SHA1	Message	Date
Matt Mackall	11423d02c7	diff: don't show function name by default ... We'd mistakenly made the -p option always on, which meant there was no way to turn it off. It also meant that we were sometimes splitting multibyte characters in function name, which isn't a good default.	2008-01-16 11:14:24 -06:00
Giorgos Keramidas	5a0956cb5a	tests: add merge test for changeset 32f6be9c37df ... When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.	2007-06-23 22:43:46 -05:00