global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ffbc5dc2d0cbdbd63a4ae04dc2cc1ebf385fcc25
git/advice.c
Junio C Hamano 71b3ef11fa Merge branch 'mm/conflict-advice' 
* mm/conflict-advice:
  Be more user-friendly when refusing to do something because of conflict.

Conflicts:
	Documentation/config.txt
	advice.c
	advice.h
2010-01-20 14:42:59 -08:00

1.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink