Add index conflict functions #75

Merged

jezell merged 2 commits from add-conflict-to-index into master 2014-04-01 05:43:07 -05:00

Conversation 0 Commits 2 Files Changed 2 +179 -17

2 Commits

Author	SHA1	Message	Date
Jesse Ezell	dcdf2c3555	add conflict functions	2014-03-30 19:53:07 -07:00
Simon Menke	429408dbe5	Added force argument for (*Submodule).Reload() and (*Repository).ReloadAllSubmodules()	2014-03-27 11:32:22 +01:00