git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-20 17:54:13 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
4da504608ea94fbcac65eb287d8d5791bddefd88
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