Junio C Hamano 5cdc9fbb08 Merge branch 'jn/merge-no-edit-fix' ...

* jn/merge-no-edit-fix:
  merge: do not launch an editor on "--no-edit $tag"

Conflicts:
	builtin/merge.c

2012-02-12 22:41:51 -08:00

41 KiB

Raw Blame History

View Raw