diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-25 21:47:09 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
| commit | df2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb (patch) | |
| tree | cf81b693a81e9bca1a5044706a4ba12c041bf55f /spec/support/test_env.rb | |
| parent | ff15fbf10c8c32fde876e5c9578fdc2161b7905c (diff) | |
Add backend for merge conflicts reading
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 1c0c66969e3..976b1f36270 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -19,6 +19,8 @@ module TestEnv 'orphaned-branch' => '45127a9', 'binary-encoding' => '7b1cf43', 'gitattributes' => '5a62481', + 'conflict-a' => 'dfdd207', + 'conflict-b' => '4e75a62', 'expand-collapse-diffs' => '4842455', 'expand-collapse-files' => '025db92', 'expand-collapse-lines' => '238e82d', |