Merge branch 'jc/diff-prefix'

* jc/diff-prefix: diff: vary default prefix depending on what are compared
2008-09-18 20:30:07 -07:00
parent c4398286fa a5a818ee48
commit e69a6f47c4
7 changed files with 70 additions and 8 deletions
--- a/builtin-diff.c
+++ b/builtin-diff.c
@ -74,6 +74,8 @@ static int builtin_diff_b_f(struct rev_info *revs,
 	if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
 		die("'%s': not a regular file or symlink", path);

+	diff_set_mnemonic_prefix(&revs->diffopt, "o/", "w/");
+
 	if (blob[0].mode == S_IFINVALID)
 		blob[0].mode = canon_mode(st.st_mode);